haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix ccache and distcc setup 

RULE_LAUNCH_COMPILE is not meant for use. It's meant for internal ctest use only per the documentation.
This commit is contained in:
Mark Roszko 2024-05-07 13:08:11 +00:00
parent 0402c03468
commit eda65f5fa8
1 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
CMakeLists.txt
View File

@ -354,13 +354,9 @@ add_compile_definitions( $<$<BOOL:${KICAD_BUILD_ARCH_ARM64}>:KICAD_BUILD_ARCH_AR
if (USE_CCACHE) if (USE_CCACHE)
find_program(CCACHE_FOUND ccache) find_program(CCACHE_FOUND ccache)
if(CCACHE_FOUND) if(CCACHE_FOUND)
get_property(RULE_LAUNCH_COMPILE GLOBAL PROPERTY RULE_LAUNCH_COMPILE) # Set ccache on the actual lang
set(RULE_LAUNCH_COMPILE "${RULE_LAUNCH_COMPILE} ${CCACHE_FOUND}") list(APPEND CMAKE_C_COMPILER_LAUNCHER ${CCACHE_FOUND})
set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE ${RULE_LAUNCH_COMPILE}) list(APPEND CMAKE_CXX_COMPILER_LAUNCHER ${CCACHE_FOUND})
get_property(RULE_LAUNCH_LINK GLOBAL PROPERTY RULE_LAUNCH_LINK)
set(RULE_LAUNCH_LINK "${RULE_LAUNCH_LINK} ${CCACHE_FOUND}")
set_property(GLOBAL PROPERTY RULE_LAUNCH_LINK ${RULE_LAUNCH_LINK})
message(STATUS "Used ${CCACHE_FOUND} for compilation.") message(STATUS "Used ${CCACHE_FOUND} for compilation.")
else(CCACHE_FOUND) else(CCACHE_FOUND)
@ -375,9 +371,9 @@ endif(USE_CCACHE)
if (USE_DISTCC) if (USE_DISTCC)
find_program(DISTCC_FOUND distcc) find_program(DISTCC_FOUND distcc)
if(DISTCC_FOUND) if(DISTCC_FOUND)
get_property(RULE_LAUNCH_COMPILE GLOBAL PROPERTY RULE_LAUNCH_COMPILE) list(APPEND CMAKE_C_COMPILER_LAUNCHER ${DISTCC_FOUND})
set(RULE_LAUNCH_COMPILE "${RULE_LAUNCH_COMPILE} ${DISTCC_FOUND}") list(APPEND CMAKE_CXX_COMPILER_LAUNCHER ${DISTCC_FOUND})
set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE ${RULE_LAUNCH_COMPILE})
message(STATUS "Using ${DISTCC_FOUND} for distributed build.") message(STATUS "Using ${DISTCC_FOUND} for distributed build.")
else(DISTCC_FOUND) else(DISTCC_FOUND)
message(INFO "Distcc was requested but not found.") message(INFO "Distcc was requested but not found.")