- 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 7f579089787b2dafd069fb5e3168c4107a614784..5351a30dc447bfac25a652fc48e7d81a29be5bda 100755 (executable)
--- 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 d80ccdeaf60d185a74e6155a86474a0a0b16d788..d0af9925098243024c1da010cd4b397978f732dd 100644 (file)
--- 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: