- SALOME_BUILD_DOC, SALOME_BUILD_TESTS should be independent in each module

- Add definitions and include directories of dependent modules

diff --git a/CMakeLists.txt b/CMakeLists.txt
index e1a09d3a2bcd7d5ce7a08852b709b281e0f53f74..ec651cc054537db49eec42a58568cc3b56334b00 100755 (executable)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -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 GHS3DPRLPLUGIN documentation" ${SALOME_BUILD_DOC})
+#OPTION(SALOME_BUILD_TESTS "Build SALOME tests" ON) #for use in the future
+OPTION(SALOME_BUILD_DOC "Generate SALOME GHS3DPRLPLUGIN documentation" ON)
 
 # Advanced options:
 OPTION(SALOME_BUILD_GUI "Enable GUI" ON)
@@ -95,6 +95,8 @@ IF(SALOME_BUILD_GUI)
   IF(EXISTS ${GUI_ROOT_DIR})
     LIST(APPEND CMAKE_MODULE_PATH "${GUI_ROOT_DIR}/adm_local/cmake_files")
     FIND_PACKAGE(SalomeGUI)
+    ADD_DEFINITIONS(${GUI_DEFINITIONS})
+    INCLUDE_DIRECTORIES(${GUI_INCLUDE_DIRS})
   ELSE(EXISTS ${GUI_ROOT_DIR})
     MESSAGE(FATAL_ERROR "We absolutely need a Salome GUI, please define GUI_ROOT_DIR")
   ENDIF(EXISTS ${GUI_ROOT_DIR})
@@ -132,6 +134,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})

diff --git a/SalomeGHS3DPRLPLUGINConfig.cmake.in b/SalomeGHS3DPRLPLUGINConfig.cmake.in
index 87e91546956f1c6a4911974bdbc84523065ef425..5abc5e9be096afbe1ed4aeb6c70ba175eccce800 100644 (file)
--- a/SalomeGHS3DPRLPLUGINConfig.cmake.in
+++ b/SalomeGHS3DPRLPLUGINConfig.cmake.in
@@ -43,6 +43,8 @@ SET_AND_CHECK(GHS3DPRLPLUGIN_ROOT_DIR_EXP "@PACKAGE_CMAKE_INSTALL_PREFIX@")
 
 # Include directories
 SET_AND_CHECK(GHS3DPRLPLUGIN_INCLUDE_DIRS "${GHS3DPRLPLUGIN_ROOT_DIR_EXP}/@SALOME_INSTALL_HEADERS@")
+SET(GHS3DPRLPLUGIN_INCLUDE_DIRS "${GHS3DPRLPLUGIN_INCLUDE_DIRS};@_SalomeGHS3DPRLPLUGIN_EXTRA_HEADERS@")
+SET(GHS3DPRLPLUGIN_DEFINITIONS "@SMESH_DEFINITIONS@")
 
 #### Now the specificities
 
@@ -50,6 +52,8 @@ SET_AND_CHECK(GHS3DPRLPLUGIN_INCLUDE_DIRS "${GHS3DPRLPLUGIN_ROOT_DIR_EXP}/@SALOM
 #SET(SALOME_GHS3DPRLPLUGIN_BUILD_TESTS @SALOME_BUILD_TESTS@)
 SET(SALOME_GHS3DPRLPLUGIN_BUILD_DOC   @SALOME_BUILD_DOC@)
 
+SET(SALOME_GHS3DPRLPLUGIN_BUILD_GUI   @SALOME_BUILD_GUI@)
+
 # Level 1 prerequisites:
 SET_AND_CHECK(SMESH_ROOT_DIR_EXP "@PACKAGE_SMESH_ROOT_DIR@")