Merge V8_4_BR branch.

[plugins/hybridplugin.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7e64af4672f2e88ea191d1b82dfdcfbb91e6f79a..ad05480241ad166e5e345e4be8aab38710c08ab2 100755 (executable)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -31,7 +31,7 @@ ENDIF(WIN32)
 STRING(TOUPPER ${PROJECT_NAME} PROJECT_NAME_UC)
 
 SET(${PROJECT_NAME_UC}_MAJOR_VERSION 8)
-SET(${PROJECT_NAME_UC}_MINOR_VERSION 0)
+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})
@@ -72,6 +72,8 @@ SET(BUILD_SHARED_LIBS TRUE)
 # ============
 OPTION(SALOME_BUILD_TESTS "Build SALOME tests" ON)
 OPTION(SALOME_BUILD_DOC "Generate SALOME HYBRIDPLUGIN documentation" ON)
+OPTION(SALOME_USE_MG_LIBS "Use MeshGems libraries" OFF)
+MARK_AS_ADVANCED(SALOME_USE_MG_LIBS)
 
 IF(SALOME_BUILD_TESTS)
   ENABLE_TESTING()
@@ -79,7 +81,6 @@ ENDIF()
 
 # Advanced options:
 OPTION(SALOME_BUILD_GUI "Enable GUI" ON)
-
 ##
 ## From KERNEL:
 ##
@@ -166,9 +167,19 @@ IF(EXISTS ${SMESH_ROOT_DIR})
 ELSE(EXISTS ${SMESH_ROOT_DIR})
   MESSAGE(FATAL_ERROR "We absolutely need a Salome SMESH, please define SMESH_ROOT_DIR")
 ENDIF(EXISTS ${SMESH_ROOT_DIR})
+
 # MEDFile
 FIND_PACKAGE(SalomeMEDFile REQUIRED)
 
+# Find MESHGEMS
+# =============
+IF(SALOME_USE_MG_LIBS)
+  FIND_PACKAGE(SalomeMESHGEMS)
+  SALOME_LOG_OPTIONAL_PACKAGE(MESHGEMS SALOME_USE_MG_LIBS)
+  ADD_DEFINITIONS(-DUSE_MG_LIBS)
+ENDIF(SALOME_USE_MG_LIBS)
+
+
 # Detection summary:
 SALOME_PACKAGE_REPORT_AND_CHECK()
 
@@ -202,6 +213,7 @@ SET(SALOME_INSTALL_DOC "${SALOME_INSTALL_DOC}" CACHE PATH "Install path: SALOME
 # Specific to HYBRIDPLUGIN:
 SET(SALOME_HYBRIDPLUGIN_INSTALL_RES_DATA "${SALOME_INSTALL_RES}/hybridplugin" CACHE PATH 
     "Install path: SALOME HYBRIDPLUGIN specific data")
+SET(SALOME_HYBRIDPLUGIN_INSTALL_TESTS ${SALOME_INSTALL_BINS})
 
 MARK_AS_ADVANCED(SALOME_INSTALL_BINS SALOME_INSTALL_LIBS SALOME_INSTALL_IDLS SALOME_INSTALL_HEADERS)
 MARK_AS_ADVANCED(SALOME_INSTALL_SCRIPT_SCRIPTS SALOME_INSTALL_SCRIPT_DATA SALOME_INSTALL_SCRIPT_PYTHON)
@@ -226,6 +238,9 @@ ADD_SUBDIRECTORY(bin)
 IF(SALOME_BUILD_DOC)
   ADD_SUBDIRECTORY(doc)
 ENDIF(SALOME_BUILD_DOC)
+IF(SALOME_BUILD_TESTS)
+  ADD_SUBDIRECTORY(tests)
+ENDIF(SALOME_BUILD_TESTS)
 
 # Header configuration
 # ====================
@@ -258,6 +273,7 @@ EXPORT(TARGETS ${_${PROJECT_NAME}_exposed_targets}
 
 # Ensure the variables are always defined for the configure:
 SET(SMESH_ROOT_DIR "${SMESH_ROOT_DIR}")
+SET(MESHGEMS_ROOT_DIR "${MESHGEMS_ROOT_DIR}")
  
 SET(CONF_INCLUDE_DIRS "${PROJECT_SOURCE_DIR}/include" "${PROJECT_BINARY_DIR}/include")
 
@@ -268,7 +284,7 @@ CONFIGURE_PACKAGE_CONFIG_FILE(${PROJECT_NAME}Config.cmake.in
     ${PROJECT_BINARY_DIR}/${PROJECT_NAME}Config.cmake
     INSTALL_DESTINATION "${SALOME_INSTALL_CMAKE_LOCAL}"
     PATH_VARS CONF_INCLUDE_DIRS SALOME_INSTALL_CMAKE_LOCAL CMAKE_INSTALL_PREFIX
-    SMESH_ROOT_DIR)
+    SMESH_ROOT_DIR MESHGEMS_ROOT_DIR)
 
 WRITE_BASIC_PACKAGE_VERSION_FILE(${PROJECT_BINARY_DIR}/${PROJECT_NAME}ConfigVersion.cmake
     VERSION ${${PROJECT_NAME_UC}_VERSION}