Skip to content

Commit ac7bc5b

Browse files
committed
[FIXUP] Rename CCACHE_EXECUTABLE --> CCACHE_COMMAND for consistency
Other cases: - CMAKE_COMMAND - PYTHON_COMMAND - BREW_COMMAND
1 parent 0476509 commit ac7bc5b

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

cmake/optional.cmake

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,14 @@
55
# Optional features and packages.
66

77
if(CCACHE)
8-
find_program(CCACHE_EXECUTABLE ccache)
9-
if(CCACHE_EXECUTABLE)
8+
find_program(CCACHE_COMMAND ccache)
9+
if(CCACHE_COMMAND)
1010
if(MSVC)
1111
if(CMAKE_VERSION VERSION_GREATER_EQUAL 3.24)
1212
# ccache >= 4.8 requires compile batching turned off that is available since CMake 3.24.
1313
# See https://github.com/ccache/ccache/wiki/MS-Visual-Studio
1414
set(CCACHE ON)
15-
set(MSVC_CCACHE_WRAPPER_CONTENT "\"${CCACHE_EXECUTABLE}\" \"${CMAKE_CXX_COMPILER}\"")
15+
set(MSVC_CCACHE_WRAPPER_CONTENT "\"${CCACHE_COMMAND}\" \"${CMAKE_CXX_COMPILER}\"")
1616
set(MSVC_CCACHE_WRAPPER_FILENAME wrapped-cl.bat)
1717
file(WRITE ${CMAKE_BINARY_DIR}/${MSVC_CCACHE_WRAPPER_FILENAME} "${MSVC_CCACHE_WRAPPER_CONTENT} %*")
1818
list(APPEND CMAKE_VS_GLOBALS
@@ -30,15 +30,15 @@ if(CCACHE)
3030
endif()
3131
else()
3232
set(CCACHE ON)
33-
list(APPEND CMAKE_C_COMPILER_LAUNCHER ${CCACHE_EXECUTABLE})
34-
list(APPEND CMAKE_CXX_COMPILER_LAUNCHER ${CCACHE_EXECUTABLE})
33+
list(APPEND CMAKE_C_COMPILER_LAUNCHER ${CCACHE_COMMAND})
34+
list(APPEND CMAKE_CXX_COMPILER_LAUNCHER ${CCACHE_COMMAND})
3535
endif()
3636
elseif(CCACHE STREQUAL "AUTO")
3737
set(CCACHE OFF)
3838
else()
3939
message(FATAL_ERROR "ccache requested, but not found.")
4040
endif()
41-
mark_as_advanced(CCACHE_EXECUTABLE)
41+
mark_as_advanced(CCACHE_COMMAND)
4242
endif()
4343

4444
if(WITH_NATPMP)

0 commit comments

Comments
 (0)