From 6bbe2e5dbaccb0445eeadf117013af88c3e737a6 Mon Sep 17 00:00:00 2001 From: mpa Date: Fri, 25 Oct 2013 11:05:43 +0000 Subject: [PATCH] CMake: Add definitions and include directories of dependent modules --- CMakeLists.txt | 2 ++ SalomeHEXABLOCKConfig.cmake.in | 2 ++ 2 files changed, 4 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index c85da7b..3722cbe 100755 --- 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 a6ac698..a7eb17a 100644 --- 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 -- 2.39.2