ForkMaster/netgenplugin
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- SALOME_BUILD_DOC, SALOME_BUILD_TESTS and SALOME_BUILD_DOC should be independent in each module

Browse Source 
- Add definitions and include directories of dependent modules
This commit is contained in:
mpa 2013-10-23 06:48:43 +00:00
parent 2c329c3f03
commit 9569036bf2
2 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
CMakeLists.txt
View File

@ -60,8 +60,8 @@ LIST(APPEND CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/adm_local/cmake_files")
# User options
# (some options have already been defined in KERNEL)
# ============
#OPTION(SALOME_BUILD_TESTS "Build SALOME tests" ${SALOME_BUILD_TESTS}) For use in the future
OPTION(SALOME_BUILD_DOC "Generate SALOME NETGENPLUGIN documentation" ${SALOME_BUILD_DOC})
#OPTION(SALOME_BUILD_TESTS "Build SALOME tests" ON) #for use in the future
OPTION(SALOME_BUILD_DOC "Generate SALOME NETGENPLUGIN documentation" ON)
# Advanced options:
OPTION(SALOME_BUILD_GUI "Enable GUI" ON)
@ -109,7 +109,7 @@ ENDIF(SALOME_BUILD_GUI)
# OCCT
FIND_PACKAGE(SalomeCAS REQUIRED)
# VTK
FIND_PACKAGE(SalomeVTK 6.0)
FIND_PACKAGE(SalomeVTK 6.0 REQUIRED)
# Find GEOM
@ -129,6 +129,13 @@ 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})
IF(SALOME_BUILD_GUI)
IF(NOT SALOME_SMESH_BUILD_GUI)
MESSAGE(FATAL_ERROR "We absolutely need a Salome SMESH with GUI, please set SALOME_BUILD_GUI=ON in SMESH module")
ENDIF(NOT SALOME_SMESH_BUILD_GUI)
ENDIF(SALOME_BUILD_GUI)
ELSE(EXISTS ${SMESH_ROOT_DIR})
MESSAGE(FATAL_ERROR "We absolutely need a Salome SMESH, please define SMESH_ROOT_DIR")
ENDIF(EXISTS ${SMESH_ROOT_DIR})

8
SalomeNETGENPLUGINConfig.cmake.in
View File

@ -43,15 +43,17 @@ SET_AND_CHECK(NETGENPLUGIN_ROOT_DIR_EXP "@PACKAGE_CMAKE_INSTALL_PREFIX@")
# Include directories
SET_AND_CHECK(NETGENPLUGIN_INCLUDE_DIRS "${NETGENPLUGIN_ROOT_DIR_EXP}/@SALOME_INSTALL_HEADERS@")
SET(NETGENPLUGIN_INCLUDE_DIRS "${NETGENPLUGIN_INCLUDE_DIRS};@_SalomeNETGENPLUGIN_EXTRA_HEADERS@")
SET(NETGENPLUGIN_DEFINITIONS "@SMESH_DEFINITIONS@")
#### Now the specificities
# Options exported by the package:
#SET(SALOME_BUILD_TESTS @SALOME_BUILD_TESTS@)
SET(SALOME_BUILD_DOC @SALOME_BUILD_DOC@)
#SET(SALOME_NETGENPLUGIN_BUILD_TESTS @SALOME_BUILD_TESTS@)
SET(SALOME_NETGENPLUGIN_BUILD_DOC @SALOME_BUILD_DOC@)
# Advanced options
SET(SALOME_BUILD_GUI @SALOME_BUILD_GUI@)
SET(SALOME_NETGENPLUGIN_BUILD_GUI @SALOME_BUILD_GUI@)
# Level 1 prerequisites:
SET_AND_CHECK(SMESH_ROOT_DIR_EXP "@PACKAGE_SMESH_ROOT_DIR@")