games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-08-15 20:03:15 +02:00
Code Issues Releases Activity

Remove redundant find_program and if(CCACHE) - if ENABLE_CCACHE is set and the generation hasn't already failed then CCACHE is guaranteed to be set and point to a ccache binary.

Browse Source
This commit is contained in:
Joakim Thorén
2023-12-27 21:12:52 +01:00
parent 7b02750034
commit fce3b5b83c
1 changed files with 21 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
CMakeLists.txt
View File

@@ -95,21 +95,18 @@ if(ENABLE_CCACHE AND LINUX)
endif() endif()
if(ENABLE_CCACHE AND (CMAKE_GENERATOR STREQUAL "Xcode")) if(ENABLE_CCACHE AND (CMAKE_GENERATOR STREQUAL "Xcode"))
find_program(CCACHE ccache REQUIRED) # https://stackoverflow.com/a/36515503/2278742
if(CCACHE) # Set up wrapper scripts
# https://stackoverflow.com/a/36515503/2278742 configure_file(xcode/launch-c.in xcode/launch-c)
# Set up wrapper scripts configure_file(xcode/launch-cxx.in xcode/launch-cxx)
configure_file(xcode/launch-c.in xcode/launch-c) execute_process(COMMAND chmod a+rx
configure_file(xcode/launch-cxx.in xcode/launch-cxx) "${CMAKE_BINARY_DIR}/xcode/launch-c"
execute_process(COMMAND chmod a+rx "${CMAKE_BINARY_DIR}/xcode/launch-cxx")
"${CMAKE_BINARY_DIR}/xcode/launch-c" # Set Xcode project attributes to route compilation through our scripts
"${CMAKE_BINARY_DIR}/xcode/launch-cxx") set(CMAKE_XCODE_ATTRIBUTE_CC "${CMAKE_BINARY_DIR}/xcode/launch-c")
# Set Xcode project attributes to route compilation through our scripts set(CMAKE_XCODE_ATTRIBUTE_CXX "${CMAKE_BINARY_DIR}/xcode/launch-cxx")
set(CMAKE_XCODE_ATTRIBUTE_CC "${CMAKE_BINARY_DIR}/xcode/launch-c") set(CMAKE_XCODE_ATTRIBUTE_LD "${CMAKE_BINARY_DIR}/xcode/launch-c")
set(CMAKE_XCODE_ATTRIBUTE_CXX "${CMAKE_BINARY_DIR}/xcode/launch-cxx") set(CMAKE_XCODE_ATTRIBUTE_LDPLUSPLUS "${CMAKE_BINARY_DIR}/xcode/launch-cxx")
set(CMAKE_XCODE_ATTRIBUTE_LD "${CMAKE_BINARY_DIR}/xcode/launch-c")
set(CMAKE_XCODE_ATTRIBUTE_LDPLUSPLUS "${CMAKE_BINARY_DIR}/xcode/launch-cxx")
endif()
endif() endif()
# Allow to pass package name from Travis CI # Allow to pass package name from Travis CI
@@ -275,19 +272,16 @@ if(MINGW OR MSVC)
if(MSVC) if(MSVC)
if(ENABLE_CCACHE) if(ENABLE_CCACHE)
# https://github.com/ccache/ccache/discussions/1154#discussioncomment-3611387 # https://github.com/ccache/ccache/discussions/1154#discussioncomment-3611387
find_program(CCACHE ccache REQUIRED) file(COPY_FILE
if (CCACHE) ${CCACHE} ${CMAKE_BINARY_DIR}/cl.exe
file(COPY_FILE ONLY_IF_DIFFERENT)
${CCACHE} ${CMAKE_BINARY_DIR}/cl.exe
ONLY_IF_DIFFERENT)
set(CMAKE_VS_GLOBALS set(CMAKE_VS_GLOBALS
"CLToolExe=cl.exe" "CLToolExe=cl.exe"
"CLToolPath=${CMAKE_BINARY_DIR}" "CLToolPath=${CMAKE_BINARY_DIR}"
"TrackFileAccess=false" "TrackFileAccess=false"
"UseMultiToolTask=true" "UseMultiToolTask=true"
) )
endif()
endif() endif()
add_definitions(-DBOOST_ALL_NO_LIB) add_definitions(-DBOOST_ALL_NO_LIB)