From 2519099312ed22f6635b637ed805262ea1e16c02 Mon Sep 17 00:00:00 2001 From: mpa Date: Fri, 25 Oct 2013 11:08:05 +0000 Subject: [PATCH] - SALOME_BUILD_DOC, SALOME_BUILD_TESTS should be independent in each module - Add definitions and include directories of dependent modules --- CMakeLists.txt | 8 ++++++-- SalomeHEXABLOCKPLUGINConfig.cmake.in | 2 ++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index d1997ec..8927f50 100755 --- 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 b3405f1..fc7c289 100644 --- 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 -- 2.30.2