Salome HOME
projects
/
plugins
/
ghs3dprlplugin.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Redesign SALOME documentation
[plugins/ghs3dprlplugin.git]
/
CMakeLists.txt
diff --git
a/CMakeLists.txt
b/CMakeLists.txt
index 4f84c1278b99ef68799cf44dd28e8d16d343d755..226fde11238d7413ce3eb6fb3091aa859e876023 100755
(executable)
--- a/
CMakeLists.txt
+++ b/
CMakeLists.txt
@@
-28,7
+28,7
@@
CMAKE_POLICY(SET CMP0003 NEW)
STRING(TOUPPER ${PROJECT_NAME} PROJECT_NAME_UC)
SET(${PROJECT_NAME_UC}_MAJOR_VERSION 8)
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})
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})
@@
-67,6
+67,8
@@
SET(BUILD_SHARED_LIBS TRUE)
# ============
OPTION(SALOME_BUILD_TESTS "Build SALOME tests" ON)
OPTION(SALOME_BUILD_DOC "Generate SALOME GHS3DPRLPLUGIN documentation" ON)
# ============
OPTION(SALOME_BUILD_TESTS "Build SALOME tests" ON)
OPTION(SALOME_BUILD_DOC "Generate SALOME GHS3DPRLPLUGIN documentation" ON)
+OPTION(SALOME_USE_MG_LIBS "Use MeshGems libraries" OFF)
+MARK_AS_ADVANCED(SALOME_USE_MG_LIBS)
IF(SALOME_BUILD_TESTS)
ENABLE_TESTING()
IF(SALOME_BUILD_TESTS)
ENABLE_TESTING()
@@
-129,7
+131,7
@@
ENDIF(SALOME_BUILD_GUI)
# VTK
FIND_PACKAGE(SalomeVTK REQUIRED)
# OCCT
# VTK
FIND_PACKAGE(SalomeVTK REQUIRED)
# OCCT
-FIND_PACKAGE(Salome
CAS
REQUIRED)
+FIND_PACKAGE(Salome
OpenCASCADE
REQUIRED)
# Find GEOM
# ===========
# Find GEOM
# ===========
@@
-164,9
+166,18
@@
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})
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)
# 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()
# Detection summary:
SALOME_PACKAGE_REPORT_AND_CHECK()
@@
-256,11
+267,12
@@
EXPORT(TARGETS ${_${PROJECT_NAME}_exposed_targets}
# Ensure the variables are always defined for the configure:
SET(SMESH_ROOT_DIR "${SMESH_ROOT_DIR}")
# 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:
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
CONFIGURE_PACKAGE_CONFIG_FILE(${PROJECT_NAME}Config.cmake.in
${PROJECT_BINARY_DIR}/${PROJECT_NAME}Config.cmake