From 22301d41d31e72f7d1bbb68dfa601b0e3bf79b22 Mon Sep 17 00:00:00 2001 From: Paul Date: Thu, 27 Oct 2022 16:01:39 -0500 Subject: [PATCH 1/3] Remove ccache.cmake so ccache can work on older cmake versions --- CMakeLists.txt | 1 - cmake/ccache.cmake | 7 ------- 2 files changed, 8 deletions(-) delete mode 100644 cmake/ccache.cmake diff --git a/CMakeLists.txt b/CMakeLists.txt index 9a360178baa..2628867a14e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -5,7 +5,6 @@ set(CMAKE_EXPORT_COMPILE_COMMANDS ON) include(GNUInstallDirs) -include(cmake/ccache.cmake) include(cmake/compilerCheck.cmake) include(cmake/versions.cmake) include(cmake/options.cmake) diff --git a/cmake/ccache.cmake b/cmake/ccache.cmake deleted file mode 100644 index 403b61eacdc..00000000000 --- a/cmake/ccache.cmake +++ /dev/null @@ -1,7 +0,0 @@ -if (CMAKE_VERSION VERSION_LESS "3.17") - if (CMAKE_CXX_COMPILER_LAUNCHER) - set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE "${CMAKE_CXX_COMPILER_LAUNCHER}") - elseif (CMAKE_C_COMPILER_LAUNCHER) - set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE "${CMAKE_C_COMPILER_LAUNCHER}") - endif() -endif() \ No newline at end of file From acd4faa5cf419c862c43430a2da3e071c7cd97b2 Mon Sep 17 00:00:00 2001 From: Paul Date: Sun, 13 Nov 2022 11:12:54 -0600 Subject: [PATCH 2/3] Revert "Remove ccache.cmake so ccache can work on older cmake versions" This reverts commit 22301d41d31e72f7d1bbb68dfa601b0e3bf79b22. --- CMakeLists.txt | 1 + cmake/ccache.cmake | 7 +++++++ 2 files changed, 8 insertions(+) create mode 100644 cmake/ccache.cmake diff --git a/CMakeLists.txt b/CMakeLists.txt index 2628867a14e..9a360178baa 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -5,6 +5,7 @@ set(CMAKE_EXPORT_COMPILE_COMMANDS ON) include(GNUInstallDirs) +include(cmake/ccache.cmake) include(cmake/compilerCheck.cmake) include(cmake/versions.cmake) include(cmake/options.cmake) diff --git a/cmake/ccache.cmake b/cmake/ccache.cmake new file mode 100644 index 00000000000..403b61eacdc --- /dev/null +++ b/cmake/ccache.cmake @@ -0,0 +1,7 @@ +if (CMAKE_VERSION VERSION_LESS "3.17") + if (CMAKE_CXX_COMPILER_LAUNCHER) + set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE "${CMAKE_CXX_COMPILER_LAUNCHER}") + elseif (CMAKE_C_COMPILER_LAUNCHER) + set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE "${CMAKE_C_COMPILER_LAUNCHER}") + endif() +endif() \ No newline at end of file From 57aa683b78b94762bcf5ac21373b5e58bef4e4fa Mon Sep 17 00:00:00 2001 From: Paul Date: Sun, 13 Nov 2022 11:13:11 -0600 Subject: [PATCH 3/3] Update version --- cmake/ccache.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake/ccache.cmake b/cmake/ccache.cmake index 403b61eacdc..73ad5a189c4 100644 --- a/cmake/ccache.cmake +++ b/cmake/ccache.cmake @@ -1,4 +1,4 @@ -if (CMAKE_VERSION VERSION_LESS "3.17") +if (CMAKE_VERSION VERSION_LESS "3.0") if (CMAKE_CXX_COMPILER_LAUNCHER) set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE "${CMAKE_CXX_COMPILER_LAUNCHER}") elseif (CMAKE_C_COMPILER_LAUNCHER)