- 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 d1997ec136ddd8d9b81c311354447e2725b8d6a3..8927f50d39ec7d81b5f1eb61146bd7483ca550b8 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 HEXABLOCKPLUGIN documentation" ${SALOME_BUILD_DOC}) For use in the future
+#OPTION(SALOME_BUILD_DOC "Generate SALOME HEXABLOCKPLUGIN documentation" ON) #for use in the future
+#OPTION(SALOME_BUILD_TESTS "Build SALOME tests" ON) #for use in the future
 
 # Advanced options:
 OPTION(SALOME_BUILD_GUI "Enable GUI" ON)
@@ -119,6 +119,8 @@ 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})
 ELSE(EXISTS ${SMESH_ROOT_DIR})
   MESSAGE(FATAL_ERROR "We absolutely need a Salome SMESH, please define SMESH_ROOT_DIR")
 ENDIF(EXISTS ${SMESH_ROOT_DIR})
@@ -130,6 +132,8 @@ SET(HEXABLOCK_ROOT_DIR $ENV{HEXABLOCK_ROOT_DIR} CACHE PATH "Path to the Salome H
 IF(EXISTS ${HEXABLOCK_ROOT_DIR})
   LIST(APPEND CMAKE_MODULE_PATH "${HEXABLOCK_ROOT_DIR}/adm_local/cmake_files")
   FIND_PACKAGE(SalomeHEXABLOCK REQUIRED)
+  ADD_DEFINITIONS(${HEXABLOCK_DEFINITIONS})
+  INCLUDE_DIRECTORIES(${HEXABLOCK_INCLUDE_DIRS})
 ELSE(EXISTS ${HEXABLOCK_ROOT_DIR})
   MESSAGE(FATAL_ERROR "We absolutely need a Salome HEXABLOCK, please define HEXABLOCK_ROOT_DIR")
 ENDIF(EXISTS ${HEXABLOCK_ROOT_DIR})

diff --git a/SalomeHEXABLOCKPLUGINConfig.cmake.in b/SalomeHEXABLOCKPLUGINConfig.cmake.in
index b3405f1d2d975d9dee08cb07d6d8b48307135f23..fc7c289947bcaeae803f2df2d4115ce05c247ac3 100644 (file)
--- a/SalomeHEXABLOCKPLUGINConfig.cmake.in
+++ b/SalomeHEXABLOCKPLUGINConfig.cmake.in
@@ -43,6 +43,8 @@ SET_AND_CHECK(HEXABLOCKPLUGIN_ROOT_DIR_EXP "@PACKAGE_CMAKE_INSTALL_PREFIX@")
 
 # Include directories
 SET_AND_CHECK(HEXABLOCKPLUGIN_INCLUDE_DIRS "${HEXABLOCKPLUGIN_ROOT_DIR_EXP}/@SALOME_INSTALL_HEADERS@")
+SET(HEXABLOCKPLUGIN_INCLUDE_DIRS "${HEXABLOCKPLUGIN_INCLUDE_DIRS};@_SalomeHEXABLOCKPLUGIN_EXTRA_HEADERS@")
+SET(HEXABLOCKPLUGIN_DEFINITIONS "@SMESH_DEFINITIONS@")
 
 #### Now the specificities