From 488418dd5defde0241c25004cf72bf56499cd20e Mon Sep 17 00:00:00 2001 From: mpa Date: Fri, 25 Oct 2013 11:16:26 +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 | 6 ++++-- SalomeJOBMANAGERConfig.cmake.in | 4 +++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 7f57908..5351a30 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -60,7 +60,7 @@ 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_TESTS "Build SALOME tests" ON) #for use in the future OPTION(SALOME_BUILD_DOC "Generate SALOME JOBMANAGER documentation" ON) ## @@ -87,7 +87,9 @@ ENDIF() SET(GUI_ROOT_DIR $ENV{GUI_ROOT_DIR} CACHE PATH "Path to the Salome GUI") IF(EXISTS ${GUI_ROOT_DIR}) LIST(APPEND CMAKE_MODULE_PATH "${GUI_ROOT_DIR}/adm_local/cmake_files") - FIND_PACKAGE(SalomeGUI) + FIND_PACKAGE(SalomeGUI REQUIRED) + 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}) diff --git a/SalomeJOBMANAGERConfig.cmake.in b/SalomeJOBMANAGERConfig.cmake.in index d80ccde..d0af992 100644 --- a/SalomeJOBMANAGERConfig.cmake.in +++ b/SalomeJOBMANAGERConfig.cmake.in @@ -43,11 +43,13 @@ SET_AND_CHECK(JOBMANAGER_ROOT_DIR_EXP "@PACKAGE_CMAKE_INSTALL_PREFIX@") # Include directories SET_AND_CHECK(JOBMANAGER_INCLUDE_DIRS "${JOBMANAGER_ROOT_DIR_EXP}/@SALOME_INSTALL_HEADERS@") +SET(JOBMANAGER_INCLUDE_DIRS "${JOBMANAGER_INCLUDE_DIRS};@_SalomeJOBMANAGER_EXTRA_HEADERS@") +SET(JOBMANAGER_DEFINITIONS "@GUI_DEFINITIONS@") #### Now the specificities # Options exported by the package: -#SET(SALOME_BUILD_TESTS @SALOME_BUILD_TESTS@) +#SET(SALOME_JOBMANAGER_BUILD_TESTS @SALOME_BUILD_TESTS@) SET(SALOME_JOBMANAGER_BUILD_DOC @SALOME_BUILD_DOC@) # Level 1 prerequisites: -- 2.30.2