CMake: Add definitions and include directories of dependent modules

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c85da7b5de99f836f628fd579114d79dbb2eedd3..3722cbec499f107eeec396f034d86dd50ffaadd1 100755 (executable)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -123,6 +123,8 @@ 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)
+  ADD_DEFINITIONS(${GEOM_DEFINITIONS})
+  INCLUDE_DIRECTORIES(${GEOM_INCLUDE_DIRS})
 ELSE(EXISTS ${GEOM_ROOT_DIR})
   MESSAGE(FATAL_ERROR "We absolutely need a Salome GEOM, please define GEOM_ROOT_DIR")
 ENDIF(EXISTS ${GEOM_ROOT_DIR})

diff --git a/SalomeHEXABLOCKConfig.cmake.in b/SalomeHEXABLOCKConfig.cmake.in
index a6ac698f37c8828b93d86b34bb478b4114ecc149..a7eb17a34c9c95bbd693b2ca3fc176db79583653 100644 (file)
--- a/SalomeHEXABLOCKConfig.cmake.in
+++ b/SalomeHEXABLOCKConfig.cmake.in
@@ -43,6 +43,8 @@ SET_AND_CHECK(HEXABLOCK_ROOT_DIR_EXP "@PACKAGE_CMAKE_INSTALL_PREFIX@")
 
 # Include directories
 SET_AND_CHECK(HEXABLOCK_INCLUDE_DIRS "${HEXABLOCK_ROOT_DIR_EXP}/@SALOME_INSTALL_HEADERS@")
+SET(HEXABLOCK_INCLUDE_DIRS "${HEXABLOCK_INCLUDE_DIRS};@_SalomeHEXABLOCK_EXTRA_HEADERS@")
+SET(HEXABLOCK_DEFINITIONS "@GEOM_DEFINITIONS@")
 
 #### Now the specificities