From 4ccf7a87a9c4760c3dace91ca92aa84600925d38 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adri=C3=A1n=20Insaurralde=20Avalos?= Date: Tue, 25 Jul 2023 22:52:49 -0400 Subject: [PATCH] fix use ccache by default on most systems --- CMakeLists.txt | 6 ++++++ cMake/FreeCAD_Helpers/InitializeFreeCADBuildOptions.cmake | 5 ----- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 87b1f16c90..ab8bba0396 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -10,6 +10,12 @@ if (POLICY CMP0072) set(OpenGL_GL_PREFERENCE LEGACY) endif(POLICY CMP0072) +if (BUILD_WITH_CONDA AND WIN32) + option(FREECAD_USE_CCACHE "Auto detect and use ccache during compilation" OFF) +else() + option(FREECAD_USE_CCACHE "Auto detect and use ccache during compilation" ON) +endif() + if(FREECAD_USE_CCACHE) find_program(CCACHE_PROGRAM ccache) #This check should occur before project() if(CCACHE_PROGRAM) diff --git a/cMake/FreeCAD_Helpers/InitializeFreeCADBuildOptions.cmake b/cMake/FreeCAD_Helpers/InitializeFreeCADBuildOptions.cmake index 2558c5a65f..91ffb54f66 100644 --- a/cMake/FreeCAD_Helpers/InitializeFreeCADBuildOptions.cmake +++ b/cMake/FreeCAD_Helpers/InitializeFreeCADBuildOptions.cmake @@ -20,11 +20,6 @@ macro(InitializeFreeCADBuildOptions) else() option(FREECAD_USE_QT_FILEDIALOG "Use Qt's file dialog instead of the native one." ON) endif() - if (BUILD_WITH_CONDA AND WIN32) - option(FREECAD_USE_CCACHE "Auto detect and use ccache during compilation" OFF) - else() - option(FREECAD_USE_CCACHE "Auto detect and use ccache during compilation" ON) - endif() # == Win32 is default behaviour use the LibPack copied in Source tree ========== if(MSVC)