X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=CMakeLists.txt;h=ebb60ac8a47268ddf980173bb3a04bfbd20d26a0;hb=b51b71773a2f2386a6074fe8c292a4952a106c17;hp=eae8828317a9094ac9e295518f260dc72dc0f263;hpb=d1a2db4c30bcb88ba7a08e578575192eeebf63a8;p=plugins%2Fhexoticplugin.git

diff --git a/CMakeLists.txt b/CMakeLists.txt
old mode 100755
new mode 100644
index eae8828..ebb60ac
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2012-2016  CEA/DEN, EDF R&D
+# Copyright (C) 2012-2021  CEA/DEN, EDF R&D
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -19,30 +19,32 @@
 CMAKE_MINIMUM_REQUIRED(VERSION 2.8.8 FATAL_ERROR)
 PROJECT(SalomeHexoticPLUGIN C CXX)
 
-# Ensure a proper linker behavior:
-CMAKE_POLICY(SET CMP0003 NEW)
-IF(WIN32)
-  CMAKE_POLICY(SET CMP0020 OLD) # disable automatic linking to qtmain.lib 
-ENDIF(WIN32)
-
 # Versioning
 # ===========
 # Project name, upper case
 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}_MAJOR_VERSION 9)
+SET(${PROJECT_NAME_UC}_MINOR_VERSION 7)
 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 1)
 
+# Common CMake macros
+# ===================
+SET(CONFIGURATION_ROOT_DIR $ENV{CONFIGURATION_ROOT_DIR} CACHE PATH "Path to the Salome CMake configuration files")
+IF(EXISTS ${CONFIGURATION_ROOT_DIR})
+  LIST(APPEND CMAKE_MODULE_PATH "${CONFIGURATION_ROOT_DIR}/cmake")
+  INCLUDE(SalomeMacros NO_POLICY_SCOPE)
+ELSE()
+  MESSAGE(FATAL_ERROR "We absolutely need the Salome CMake configuration files, please define CONFIGURATION_ROOT_DIR !")
+ENDIF()
+
 # Find KERNEL
 # ===========
 SET(KERNEL_ROOT_DIR $ENV{KERNEL_ROOT_DIR} CACHE PATH "Path to the Salome KERNEL")
 IF(EXISTS ${KERNEL_ROOT_DIR})
-  LIST(APPEND CMAKE_MODULE_PATH "${KERNEL_ROOT_DIR}/salome_adm/cmake_files")
-  INCLUDE(SalomeMacros)
   FIND_PACKAGE(SalomeKERNEL REQUIRED)
   KERNEL_WITH_CORBA() # check whether KERNEL builded with CORBA
 ELSE(EXISTS ${KERNEL_ROOT_DIR})
@@ -54,8 +56,6 @@ ENDIF(EXISTS ${KERNEL_ROOT_DIR})
 INCLUDE(SalomeSetupPlatform)   # From KERNEL
 # Always build libraries as shared objects:
 SET(BUILD_SHARED_LIBS TRUE)
-# Local macros:
-LIST(APPEND CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/adm_local/cmake_files")
 
 # User options
 # ============
@@ -67,6 +67,8 @@ IF(SALOME_BUILD_TESTS)
 ENDIF()
 
 # Advanced options:
+OPTION(SALOME_USE_MG_LIBS "Use MeshGems libraries" OFF)
+MARK_AS_ADVANCED(SALOME_USE_MG_LIBS)
 OPTION(SALOME_BUILD_GUI "Enable HexoticPLUGIN GUI" ON)
 MARK_AS_ADVANCED(SALOME_BUILD_GUI)
 OPTION(SALOME_HEXOTICPLUGIN_USE_BLSURFPLUGIN "Enable using BLSURFPLUGIN" ON)
@@ -97,7 +99,6 @@ ENDIF()
 IF(SALOME_BUILD_GUI)
   SET(GUI_ROOT_DIR $ENV{GUI_ROOT_DIR} CACHE PATH "Path to the Salome GUI")
   IF(EXISTS ${GUI_ROOT_DIR})
-    LIST(APPEND CMAKE_MODULE_PATH "${GUI_ROOT_DIR}/adm_local/cmake_files")
     FIND_PACKAGE(SalomeGUI)
     SALOME_GUI_WITH_CORBA() # check whether GUI builded with CORBA
     ADD_DEFINITIONS(${GUI_DEFINITIONS})
@@ -114,15 +115,11 @@ ENDIF(SALOME_BUILD_GUI)
 
 IF(SALOME_BUILD_GUI)
   # Qt
-  IF(NOT SALOME_GUI_BUILD_WITH_QT5)
-    FIND_PACKAGE(SalomeQt4 REQUIRED COMPONENTS QtCore QtGui)
-  ELSE()
-    FIND_PACKAGE(SalomeQt5 REQUIRED)
-  ENDIF()
+  FIND_PACKAGE(SalomeQt5 REQUIRED)
 ENDIF(SALOME_BUILD_GUI)
 
 # OCCT
-FIND_PACKAGE(SalomeCAS REQUIRED)
+FIND_PACKAGE(SalomeOpenCASCADE REQUIRED)
 # VTK
 FIND_PACKAGE(SalomeVTK REQUIRED)
 
@@ -131,7 +128,6 @@ FIND_PACKAGE(SalomeVTK REQUIRED)
 
 SET(GEOM_ROOT_DIR $ENV{GEOM_ROOT_DIR} CACHE PATH "Path to the Salome GEOM")
 IF(EXISTS ${GEOM_ROOT_DIR})
-  LIST(APPEND CMAKE_MODULE_PATH "${GEOM_ROOT_DIR}/adm_local/cmake_files")
   FIND_PACKAGE(SalomeGEOM REQUIRED)
 ELSE(EXISTS ${GEOM_ROOT_DIR})
   MESSAGE(FATAL_ERROR "We absolutely need a Salome GEOM, please define GEOM_ROOT_DIR")
@@ -142,7 +138,6 @@ ENDIF(EXISTS ${GEOM_ROOT_DIR})
 
 SET(SMESH_ROOT_DIR $ENV{SMESH_ROOT_DIR} CACHE PATH "Path to the Salome SMESH")
 IF(EXISTS ${SMESH_ROOT_DIR})
-  LIST(APPEND CMAKE_MODULE_PATH "${SMESH_ROOT_DIR}/adm_local/cmake_files")
   FIND_PACKAGE(SalomeSMESH REQUIRED)
   ADD_DEFINITIONS(${SMESH_DEFINITIONS})
   INCLUDE_DIRECTORIES(${SMESH_INCLUDE_DIRS})
@@ -156,16 +151,24 @@ ELSE(EXISTS ${SMESH_ROOT_DIR})
   MESSAGE(FATAL_ERROR "We absolutely need a Salome SMESH, please define SMESH_ROOT_DIR")
 ENDIF(EXISTS ${SMESH_ROOT_DIR})
 
+##
+## Find MESHGEMS (optional)
+## =============
+
+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)
+
 # Find BLSURFPLUGIN (optional)
 # ===========
 
 IF(SALOME_HEXOTICPLUGIN_USE_BLSURFPLUGIN)
   SET(BLSURFPLUGIN_ROOT_DIR $ENV{BLSURFPLUGIN_ROOT_DIR} CACHE PATH "Path to the Salome BLSURFPLUGIN")
   IF(EXISTS ${BLSURFPLUGIN_ROOT_DIR})
-    LIST(APPEND CMAKE_MODULE_PATH "${BLSURFPLUGIN_ROOT_DIR}/adm_local/cmake_files")
     FIND_PACKAGE(SalomeBLSURFPLUGIN)
     SALOME_LOG_OPTIONAL_PACKAGE(SalomeBLSURFPLUGIN WITH_BLSURFPLUGIN)
-
   ENDIF(EXISTS ${BLSURFPLUGIN_ROOT_DIR})
   IF(SalomeBLSURFPLUGIN_FOUND)
     ADD_DEFINITIONS(-DWITH_BLSURFPLUGIN)
@@ -262,17 +265,18 @@ 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")
 
 # Build variables that will be expanded when configuring Salome<MODULE>Config.cmake:
-# SALOME_CONFIGURE_PREPARE() #For use in the future
+SALOME_CONFIGURE_PREPARE(MESHGEMS)
 
 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}