Fix Body Fitting regression on smesh/imps_11/M3

[modules/smesh.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 37fa5d94d0e5d668111108b86d8037c71626f093..3515fa48d53d114b06f583afb45531afb076bc5e 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -33,11 +33,11 @@ ENDIF(WIN32)
 STRING(TOUPPER ${PROJECT_NAME} PROJECT_NAME_UC)
 
 SET(${PROJECT_NAME_UC}_MAJOR_VERSION 9)
-SET(${PROJECT_NAME_UC}_MINOR_VERSION 3)
+SET(${PROJECT_NAME_UC}_MINOR_VERSION 4)
 SET(${PROJECT_NAME_UC}_PATCH_VERSION 0)
 SET(${PROJECT_NAME_UC}_VERSION
   ${${PROJECT_NAME_UC}_MAJOR_VERSION}.${${PROJECT_NAME_UC}_MINOR_VERSION}.${${PROJECT_NAME_UC}_PATCH_VERSION})
-SET(${PROJECT_NAME_UC}_VERSION_DEV 0)
+SET(${PROJECT_NAME_UC}_VERSION_DEV 1)
 
 # Common CMake macros
 # ===================
@@ -76,10 +76,11 @@ OPTION(SALOME_BUILD_TESTS "Build SALOME tests" ON)
 OPTION(SALOME_BUILD_DOC "Generate SALOME SMESH documentation" ON)
   
 # Advanced options:
-OPTION(SALOME_BUILD_GUI            "Enable GUI" ON)
-OPTION(SALOME_SMESH_USE_CGNS       "Enable import/export to CGNS format" OFF)
-OPTION(SALOME_SMESH_USE_TBB        "Enable parallel computation" OFF)
-OPTION(SALOME_SMESH_DYNLOAD_LOCAL  "Load plug-ins' symbols locally (Linux only)" ON)
+OPTION(SALOME_BUILD_GUI           "Enable GUI" ON)
+OPTION(SALOME_SMESH_USE_CGNS      "Enable import/export to CGNS format" OFF)
+OPTION(SALOME_SMESH_USE_TBB       "Enable parallel computation" OFF)
+OPTION(SALOME_SMESH_DYNLOAD_LOCAL "Load plug-ins' symbols locally (Linux only)" ON)
+OPTION(SMESH_USE_MESHGEMS_HYPOSET "Prefer MeshGems algorithms in sets of hypotheses" OFF)
 CMAKE_DEPENDENT_OPTION(SALOME_SMESH_BUILD_FRENCH_DOC "Generate SALOME SMESH French documentation" OFF
                        "SALOME_BUILD_DOC" OFF)
 
@@ -87,6 +88,12 @@ IF(SALOME_SMESH_DYNLOAD_LOCAL)
   ADD_DEFINITIONS(-DDYNLOAD_LOCAL)
 ENDIF(SALOME_SMESH_DYNLOAD_LOCAL)
 
+IF(SMESH_USE_MESHGEMS_HYPOSET)
+  SET(SMESH_USE_MESHGEMS_HYPOSET_VAR "true")
+ELSE(SMESH_USE_MESHGEMS_HYPOSET)
+  SET(SMESH_USE_MESHGEMS_HYPOSET_VAR "false")
+ENDIF(SMESH_USE_MESHGEMS_HYPOSET)
+
 #On Linux use Fortran to compile MEFISTO2D
 IF(NOT WIN32)
   ENABLE_LANGUAGE(Fortran)
@@ -94,7 +101,7 @@ IF(NOT WIN32)
   ADD_DEFINITIONS(-DENABLE_MEFISTO)
 ENDIF(NOT WIN32)
 
-MARK_AS_ADVANCED(SALOME_BUILD_GUI SALOME_SMESH_USE_CGNS SALOME_SMESH_USE_TBB SALOME_SMESH_DYNLOAD_LOCAL)
+MARK_AS_ADVANCED(SALOME_BUILD_GUI SALOME_SMESH_USE_CGNS SALOME_SMESH_USE_TBB SALOME_SMESH_DYNLOAD_LOCAL SMESH_USE_MESHGEMS_HYPOSET)
 
 # Prerequisites
 # =============
@@ -151,19 +158,11 @@ IF(SALOME_BUILD_GUI)
     ## Prerequisites From GUI:
     ##
     # Qt
-    IF(NOT SALOME_GUI_BUILD_WITH_QT5)
-      FIND_PACKAGE(SalomeQt4 REQUIRED COMPONENTS QtCore QtGui QtXml)
-    ELSE()
-      FIND_PACKAGE(SalomeQt5 REQUIRED)
-    ENDIF()
+    FIND_PACKAGE(SalomeQt5 REQUIRED)
     # SIP
     FIND_PACKAGE(SalomeSIP REQUIRED)  # should come after Python and before PyQt5
     # PyQt
-    IF (NOT SALOME_GUI_BUILD_WITH_QT5)
-      FIND_PACKAGE(SalomePyQt4 REQUIRED)
-    ELSE()
-      FIND_PACKAGE(SalomePyQt5 REQUIRED)
-    ENDIF()
+    FIND_PACKAGE(SalomePyQt5 REQUIRED)
     # Qwt
     FIND_PACKAGE(SalomeQwt REQUIRED)
   ELSE(EXISTS ${GUI_ROOT_DIR})