From 3b6dbeb27ee63b2f98340b9c65ab04ea4f2d5b6a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adri=C3=A1n=20Insaurralde=20Avalos?= Date: Mon, 31 Jul 2023 11:43:22 -0400 Subject: [PATCH] Rename cmake flag for unit tests to ENABLE_DEVELOPER_TESTS To differentiate from the previously existing BUILD_TEST that controls building the Test WB --- CMakeLists.txt | 2 +- cMake/FreeCAD_Helpers/InitializeFreeCADBuildOptions.cmake | 1 + cMake/FreeCAD_Helpers/PrintFinalReport.cmake | 2 +- cMake/FreeCAD_Helpers/SetupQt.cmake | 2 +- package/fedora/freecad.spec | 2 +- 5 files changed, 5 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index ab8bba03967a..0d06bf39c038 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -105,7 +105,7 @@ if(MSVC AND FREECAD_LIBPACK_USE AND LIBPACK_FOUND) CopyLibpackDirectories() endif() -if (BUILD_TEST) +if (ENABLE_DEVELOPER_TESTS) add_subdirectory(tests) endif() diff --git a/cMake/FreeCAD_Helpers/InitializeFreeCADBuildOptions.cmake b/cMake/FreeCAD_Helpers/InitializeFreeCADBuildOptions.cmake index 91ffb54f6681..88081f24677e 100644 --- a/cMake/FreeCAD_Helpers/InitializeFreeCADBuildOptions.cmake +++ b/cMake/FreeCAD_Helpers/InitializeFreeCADBuildOptions.cmake @@ -133,6 +133,7 @@ macro(InitializeFreeCADBuildOptions) option(BUILD_SURFACE "Build the FreeCAD surface module" ON) option(BUILD_VR "Build the FreeCAD Oculus Rift support (need Oculus SDK 4.x or higher)" OFF) option(BUILD_CLOUD "Build the FreeCAD cloud module" OFF) + option(ENABLE_DEVELOPER_TESTS "Build the FreeCAD unit tests suit" ON) if(MSVC) option(BUILD_FEM_NETGEN "Build the FreeCAD FEM module with the NETGEN mesher" ON) diff --git a/cMake/FreeCAD_Helpers/PrintFinalReport.cmake b/cMake/FreeCAD_Helpers/PrintFinalReport.cmake index d248210bc566..6aaa10b58770 100644 --- a/cMake/FreeCAD_Helpers/PrintFinalReport.cmake +++ b/cMake/FreeCAD_Helpers/PrintFinalReport.cmake @@ -76,7 +76,7 @@ macro(PrintFinalReport) value(CMAKE_CXX_STANDARD) value(CMAKE_CXX_FLAGS) value(CMAKE_BUILD_TYPE) - value(BUILD_TEST) + value(ENABLE_DEVELOPER_TESTS) value(FREECAD_USE_FREETYPE) value(FREECAD_USE_EXTERNAL_SMESH) value(BUILD_SMESH) diff --git a/cMake/FreeCAD_Helpers/SetupQt.cmake b/cMake/FreeCAD_Helpers/SetupQt.cmake index 70d2154fa4ef..567b5cd9fafc 100644 --- a/cMake/FreeCAD_Helpers/SetupQt.cmake +++ b/cMake/FreeCAD_Helpers/SetupQt.cmake @@ -23,7 +23,7 @@ if(BUILD_GUI) list (APPEND FREECAD_QT_COMPONENTS Designer) endif() endif() -if (BUILD_TEST) +if (ENABLE_DEVELOPER_TESTS) list (APPEND FREECAD_QT_COMPONENTS Test) endif () diff --git a/package/fedora/freecad.spec b/package/fedora/freecad.spec index d6986e600d6f..4e25bc37e2f3 100644 --- a/package/fedora/freecad.spec +++ b/package/fedora/freecad.spec @@ -232,7 +232,7 @@ LDFLAGS='-Wl,--as-needed -Wl,--no-undefined'; export LDFLAGS %endif -DPACKAGE_WCREF="%{release} (Git)" \ -DPACKAGE_WCURL="git://github.com/%{github_name}/FreeCAD.git master" \ - -DBUILD_TEST=FALSE \ + -DENABLE_DEVELOPER_TESTS=FALSE \ ../ make fc_version