From e507dd0390bd8f9a86a55b9add63d9d2aed0fe24 Mon Sep 17 00:00:00 2001 From: Aiken Harris Date: Thu, 11 Sep 2025 14:07:20 +0200 Subject: [PATCH] Clean up cmake output directory configuration --- CMakeLists.txt | 3 --- sdk/cmake/xtchain.cmake | 3 ++- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index f6ce6f6..6655d7a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -55,9 +55,6 @@ add_definitions(-D__XTOS__) add_definitions(-DXTOS_SOURCE_DIR="${EXECTOS_SOURCE_DIR}") add_definitions(-DXTOS_BINARY_DIR="${EXECTOS_BINARY_DIR}") -# Set libraries target directory -set(LIBRARY_OUTPUT_PATH ${EXECTOS_BINARY_DIR}/output/library CACHE PATH "Build directory" FORCE) - # Compute __FILE__ definition file(RELATIVE_PATH _PATH_PREFIX ${EXECTOS_BINARY_DIR} ${EXECTOS_SOURCE_DIR}) add_compiler_flags(-D__RELFILE__="&__FILE__[__FILE__[0] == '.' ? sizeof \\\"${_PATH_PREFIX}\\\" - 1 : sizeof XTOS_SOURCE_DIR]") diff --git a/sdk/cmake/xtchain.cmake b/sdk/cmake/xtchain.cmake index 9e48f5a..a1c8457 100644 --- a/sdk/cmake/xtchain.cmake +++ b/sdk/cmake/xtchain.cmake @@ -50,8 +50,9 @@ add_compiler_ccxxflags("-Wno-gnu-folding-constant") # Disable compiler builtins add_compiler_ccxxflags("-fno-builtin") -# Set debugging symbols output directory +# Set symbols and libraries output directory set(CMAKE_PDB_OUTPUT_DIRECTORY "${EXECTOS_BINARY_DIR}/output/symbols") +set(LIBRARY_OUTPUT_PATH "${EXECTOS_BINARY_DIR}/output/libraries") # Set linker flags add_linker_flags("${HOTPATCH_LINKER_FLAG} /LARGEADDRESSAWARE /IGNORE:4039 /IGNORE:4104 /MANIFEST:NO /NODEFAULTLIB /SAFESEH:NO")