- 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 357c8236671bd0f2ab9ad21af87b2ba5f5e6a849..b7666973225d556e89990e59b9b4404242ff3018 100755 (executable)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -60,31 +60,36 @@ 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 PYHELLO documentation" ${SALOME_BUILD_DOC})
+# OPTION(SALOME_BUILD_TESTS "Build SALOME tests" ON) For use in the future
+OPTION(SALOME_BUILD_DOC "Generate SALOME PYHELLO 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
 # ===========
 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})
 
 ##
-## PYHELLO specifics
+## From GUI:
 ##
-
-FIND_PACKAGE(SalomePython REQUIRED)
-FIND_PACKAGE(SalomeOmniORB REQUIRED)
-FIND_PACKAGE(SalomeOmniORBPy REQUIRED)
 # Qt4
 FIND_PACKAGE(SalomeQt4 REQUIRED COMPONENTS QtCore QtGui)
 INCLUDE(${QT_USE_FILE})

diff --git a/SalomePYHELLOConfig.cmake.in b/SalomePYHELLOConfig.cmake.in
index 5cf7ad43b152f115bddab5d71afe583bb5c5daff..592f09810a2956816e7b8b1f2fe4f22bb2c9666f 100644 (file)
--- a/SalomePYHELLOConfig.cmake.in
+++ b/SalomePYHELLOConfig.cmake.in
@@ -37,6 +37,8 @@ SET_AND_CHECK(PYHELLO_ROOT_DIR_EXP "@PACKAGE_CMAKE_INSTALL_PREFIX@")
 
 # Include directories
 SET_AND_CHECK(PYHELLO_INCLUDE_DIRS "${PYHELLO_ROOT_DIR_EXP}/@SALOME_INSTALL_HEADERS@")
+SET(PYHELLO_INCLUDE_DIRS "${PYHELLO_INCLUDE_DIRS};@_SalomePYHELLO_EXTRA_HEADERS@")
+SET(PYHELLO_DEFINITIONS "@GUI_DEFINITIONS@")
 
 # Load the dependencies for the libraries of @PROJECT_NAME@ 
 # (contains definitions for IMPORTED targets). This is only 
@@ -48,8 +50,8 @@ ENDIF()
 #### Now the specificities
 
 # Options exported by the package:
-#SET(SALOME_BUILD_TESTS @SALOME_BUILD_TESTS@)
-SET(SALOME_BUILD_DOC   @SALOME_BUILD_DOC@)
+#SET(SALOME_PYHELLO_BUILD_TESTS @SALOME_BUILD_TESTS@)
+SET(SALOME_PYHELLO_BUILD_DOC    @SALOME_BUILD_DOC@)
 
 # Level 1 prerequisites:
 SET_AND_CHECK(GUI_ROOT_DIR_EXP "@PACKAGE_GUI_ROOT_DIR@")