- 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 6bc4367846cec5c078b81bf41553ed2e91b31571..baade761d7d118b0de7d78961e05b5702e3b76b2 100755 (executable)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -60,13 +60,20 @@ 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 HELLO documentation" ${SALOME_BUILD_DOC})
-  
+# OPTION(SALOME_BUILD_TESTS "Build SALOME tests" ON) #For use in the future
+OPTION(SALOME_BUILD_DOC "Generate SALOME HELLO documentation" ON)
+
 IF(SALOME_BUILD_DOC)
   FIND_PACKAGE(SalomeDoxygen)
   SALOME_LOG_OPTIONAL_PACKAGE(Doxygen SALOME_BUILD_DOC)
 ENDIF()
+
+##
+## From KERNEL:
+##
+FIND_PACKAGE(SalomePython REQUIRED)
+FIND_PACKAGE(SalomeOmniORB REQUIRED)
+FIND_PACKAGE(SalomeOmniORBPy REQUIRED)
   
 # Find GUI
 # ===========
@@ -75,23 +82,19 @@ 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 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})
 
 ##
-## HELLO specifics
+## From GUI:
 ##
-
-FIND_PACKAGE(SalomePython REQUIRED)
-FIND_PACKAGE(SalomeOmniORB REQUIRED)
-FIND_PACKAGE(SalomeOmniORBPy REQUIRED)
-
+FIND_PACKAGE(SalomeCAS REQUIRED)
 # Qt4
 FIND_PACKAGE(SalomeQt4 REQUIRED COMPONENTS QtCore QtGui)
 INCLUDE(${QT_USE_FILE})
-# OCCT
-FIND_PACKAGE(SalomeCAS)
 
 # Detection summary:
 SALOME_PACKAGE_REPORT_AND_CHECK()

diff --git a/SalomeHELLOConfig.cmake.in b/SalomeHELLOConfig.cmake.in
index ee68d742c98918462a7201bce16b558a298e1c18..7c77a1f09ab42e7875b09bbbc71cfafd3ee2a424 100644 (file)
--- a/SalomeHELLOConfig.cmake.in
+++ b/SalomeHELLOConfig.cmake.in
@@ -43,12 +43,14 @@ SET_AND_CHECK(HELLO_ROOT_DIR_EXP "@PACKAGE_CMAKE_INSTALL_PREFIX@")
 
 # Include directories
 SET_AND_CHECK(HELLO_INCLUDE_DIRS "${HELLO_ROOT_DIR_EXP}/@SALOME_INSTALL_HEADERS@")
+SET(HELLO_INCLUDE_DIRS "${HELLO_INCLUDE_DIRS};@_SalomeHELLO_EXTRA_HEADERS@")
+SET(HELLO_DEFINITIONS "@GUI_DEFINITIONS@")
 
 #### Now the specificities
 
 # Options exported by the package:
-#SET(SALOME_BUILD_TESTS @SALOME_BUILD_TESTS@)
-SET(SALOME_BUILD_DOC   @SALOME_BUILD_DOC@)
+#SET(SALOME_HELLO_BUILD_TESTS @SALOME_BUILD_TESTS@)
+SET(SALOME_HELLO_BUILD_DOC    @SALOME_BUILD_DOC@)
 
 # Level 1 prerequisites:
 SET_AND_CHECK(GUI_ROOT_DIR_EXP "@PACKAGE_GUI_ROOT_DIR@")