From: michael <michael@localhost.localdomain>
Date: Thu, 20 Jan 2022 16:50:57 +0000 (+0100)
Subject: Do not use option() in cmake sub project
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=70d54ce9a3d2d83ec5be304aca244a7020c1c70c;p=tools%2Fsolverlab.git

Do not use option() in cmake sub project
---

diff --git a/CDMATH/CMakeLists.txt b/CDMATH/CMakeLists.txt
index 8097324..83692a4 100755
--- a/CDMATH/CMakeLists.txt
+++ b/CDMATH/CMakeLists.txt
@@ -4,16 +4,16 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
 # Project name
 project (CDMATH)
-set (CDMATH_VERSION_MAJOR 1)
-set (CDMATH_VERSION_MINOR 0)
-
-# Project options
-option (CDMATH_WITH_PETSC "Compile CDMATH with PETSc linking." ON)
-option (CDMATH_WITH_DOCUMENTATION "Generate documentation with doxygen." ON)
-option (CDMATH_WITH_PYTHON "Compile Python interface for CDMATH." ON)
-option (CDMATH_WITH_POSTPRO "Install postprocessing Python modules." ON)
-option (CDMATH_WITH_PACKAGE "Generate RPM, Debian and tarball packages." OFF)
-option (CDMATH_WITH_TESTS "Compile unit testing." ON)
+set (CDMATH_VERSION_MAJOR 9)
+set (CDMATH_VERSION_MINOR 8)
+
+# CDMATH project options (deprecated, see SOLVERLAB options)
+set (CDMATH_WITH_PETSC CACHE STRING ON "Compile CDMATH with PETSc linking")
+set (CDMATH_WITH_DOCUMENTATION ON CACHE STRING "Generate documentation with doxygen")
+set (CDMATH_WITH_PYTHON ON CACHE STRING "Compile Python interface for CDMATH")
+set (CDMATH_WITH_POSTPRO ON CACHE STRING "Install postprocessing Python modules")
+set (CDMATH_WITH_PACKAGE OFF CACHE STRING "Generate RPM, Debian and tarball packages")
+set (CDMATH_WITH_TESTS ON CACHE STRING "Compile unit testing")
 
 #Path to installed libraries
 set (PETSC_DIR            OFF CACHE STRING "PETSc library path" )
diff --git a/CoreFlows/CMakeLists.txt b/CoreFlows/CMakeLists.txt
index 947665f..046bc85 100755
--- a/CoreFlows/CMakeLists.txt
+++ b/CoreFlows/CMakeLists.txt
@@ -4,18 +4,15 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
 # Project name
 project (CoreFlows C CXX)
-set (COREFLOWS_VERSION_MAJOR 0)
-set (COREFLOWS_VERSION_MINOR 1)
-
-option (COREFLOWS_WITH_DOCUMENTATION "Generate documentation for CoreFlows use." ON)
-option (COREFLOWS_WITH_PYTHON "Compile Python interface for COREFLOWS." ON)
-option (COREFLOWS_WITH_GUI "Compile Graphic user Interface for COREFLOWS." OFF)
-option (COREFLOWS_WITH_PACKAGE "Generate RPM, Debian and tarball packages." OFF)
-option (COREFLOWS_WITH_TESTS "Compile with testing and examples." ON)
-
-#Path to installed libraries
-set (PETSC_DIR            OFF CACHE STRING "PETSc library path" )
-set (SLEPC_DIR            OFF CACHE STRING "SLEPc library path" )
+set (COREFLOWS_VERSION_MAJOR 9)
+set (COREFLOWS_VERSION_MINOR 8)
+
+# CDMATH project options (deprecated, see SOLVERLAB options)
+set (COREFLOWS_WITH_DOCUMENTATION ON CACHE STRING "Generate documentation for CoreFlows use")
+set (COREFLOWS_WITH_PYTHON ON CACHE STRING "Compile Python interface for COREFLOWS")
+set (COREFLOWS_WITH_GUI OFF CACHE STRING "Compile Graphic user Interface for COREFLOWS")
+set (COREFLOWS_WITH_PACKAGE OFF CACHE STRING "Generate RPM, Debian and tarball packages")
+set (COREFLOWS_WITH_TESTS ON CACHE STRING "Compile with testing and examples")
 
 # Debug mode activates testing and profiling --------------------------------------------------------------#
 if   (CMAKE_BUILD_TYPE STREQUAL Debug)									   #