From bed4f242792b87ae8d72a924ca37960514686617 Mon Sep 17 00:00:00 2001 From: Amine Khaldi Date: Tue, 27 Sep 2011 21:21:59 +0000 Subject: [PATCH] [CMAKE] * Prefix with ccache only when compiling c/c++ objects. * Show a note when ccache build is enabled. svn path=/trunk/; revision=53877 --- reactos/cmake/gcc.cmake | 11 +++++++++-- reactos/toolchain-gcc.cmake | 4 ++-- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/reactos/cmake/gcc.cmake b/reactos/cmake/gcc.cmake index eb5b7dd663c..436b3cd4c6a 100644 --- a/reactos/cmake/gcc.cmake +++ b/reactos/cmake/gcc.cmake @@ -1,4 +1,9 @@ +# Show a note about ccache build +if(CCACHE STREQUAL "ccache") + message("-- Enabling ccache build - done") +endif() + # Compiler Core add_compile_flags("-pipe -fms-extensions") @@ -94,6 +99,8 @@ set(CMAKE_C_CREATE_SHARED_LIBRARY " -o ") set(CMAKE_RC_CREATE_SHARED_LIBRARY " -o ") +SET(CMAKE_C_COMPILE_OBJECT "${CCACHE} -o -c ") +SET(CMAKE_CXX_COMPILE_OBJECT "${CCACHE} -o -c ") set(CMAKE_ASM_COMPILE_OBJECT " -x assembler-with-cpp -o -I${REACTOS_SOURCE_DIR}/include/asm -I${REACTOS_BINARY_DIR}/include/asm -D__ASM__ -c ") #set(CMAKE_RC_COMPILE_OBJECT " -i -I${REACTOS_SOURCE_DIR}/include/psdk -I${REACTOS_BINARY_DIR}/include/psdk -I${REACTOS_SOURCE_DIR}/include/ -I${REACTOS_SOURCE_DIR}/include/reactos -I${REACTOS_BINARY_DIR}/include/reactos -I${REACTOS_SOURCE_DIR}/include/reactos/wine -I${REACTOS_SOURCE_DIR}/include/crt -I${REACTOS_SOURCE_DIR}/include/crt/mingw32 -O coff -o ") @@ -292,10 +299,10 @@ if(PCH) if(IS_CPP) set(__lang CXX) - set(__compiler ${CMAKE_CXX_COMPILER} ${CMAKE_CXX_COMPILER_ARG1}) + set(__compiler ${CCACHE} ${CMAKE_CXX_COMPILER} ${CMAKE_CXX_COMPILER_ARG1}) else() set(__lang C) - set(__compiler ${CMAKE_C_COMPILER} ${CMAKE_C_COMPILER_ARG1}) + set(__compiler ${CCACHE} ${CMAKE_C_COMPILER} ${CMAKE_C_COMPILER_ARG1}) endif() add_custom_command(OUTPUT ${_gch_filename} diff --git a/reactos/toolchain-gcc.cmake b/reactos/toolchain-gcc.cmake index 71f2c7be68c..d955e985a33 100644 --- a/reactos/toolchain-gcc.cmake +++ b/reactos/toolchain-gcc.cmake @@ -35,8 +35,8 @@ set(CMAKE_SYSTEM_NAME Windows) set(CMAKE_SYSTEM_PROCESSOR i686) # Which tools to use -set(CMAKE_C_COMPILER ${CCACHE} ${MINGW_TOOLCHAIN_PREFIX}gcc${MINGW_TOOLCHAIN_SUFFIX}) -set(CMAKE_CXX_COMPILER ${CCACHE} ${MINGW_TOOLCHAIN_PREFIX}g++${MINGW_TOOLCHAIN_SUFFIX}) +set(CMAKE_C_COMPILER ${MINGW_TOOLCHAIN_PREFIX}gcc${MINGW_TOOLCHAIN_SUFFIX}) +set(CMAKE_CXX_COMPILER ${MINGW_TOOLCHAIN_PREFIX}g++${MINGW_TOOLCHAIN_SUFFIX}) set(CMAKE_ASM_COMPILER ${MINGW_TOOLCHAIN_PREFIX}gcc${MINGW_TOOLCHAIN_SUFFIX}) set(CMAKE_MC_COMPILER ${MINGW_TOOLCHAIN_PREFIX}windmc) set(CMAKE_RC_COMPILER ${MINGW_TOOLCHAIN_PREFIX}windres)