- 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 9fbbfd53eef590abde334573a3e1776c92303ed1..680df944abc9e039027ef691f638910381184c92 100755 (executable)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -56,8 +56,13 @@ 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 PYLIGHT documentation" ${SALOME_BUILD_DOC}) For use in the future
+# OPTION(SALOME_BUILD_TESTS "Build SALOME tests" ON) #For use in the future
+# OPTION(SALOME_BUILD_DOC "Generate SALOME PYLIGHT documentation" ON) #For use in the future
+
+##
+## From KERNEL:
+##
+FIND_PACKAGE(SalomePython REQUIRED)
 
 # Find GUI
 # ===========
@@ -65,15 +70,15 @@ 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})
 
 ##
-## PYLIGHT specifics
+## From GUI:
 ##
-
-FIND_PACKAGE(SalomePython REQUIRED)
 # Qt4
 FIND_PACKAGE(SalomeQt4 REQUIRED COMPONENTS QtCore QtGui)
 INCLUDE(${QT_USE_FILE})

diff --git a/SalomePYLIGHTConfig.cmake.in b/SalomePYLIGHTConfig.cmake.in
index cf271457500e0f247c944d056c60dbcd9fe6e674..a8331f6a5874789f82ffd928ad38e5db0bbbd8bb 100644 (file)
--- a/SalomePYLIGHTConfig.cmake.in
+++ b/SalomePYLIGHTConfig.cmake.in
@@ -37,6 +37,8 @@ SET_AND_CHECK(PYLIGHT_ROOT_DIR_EXP "@PACKAGE_CMAKE_INSTALL_PREFIX@")
 
 # Include directories
 SET_AND_CHECK(PYLIGHT_INCLUDE_DIRS "${PYLIGHT_ROOT_DIR_EXP}/@SALOME_INSTALL_HEADERS@")
+SET(PYLIGHT_INCLUDE_DIRS "${PYLIGHT_INCLUDE_DIRS};@_SalomePYLIGHT_EXTRA_HEADERS@")
+SET(PYLIGHT_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_PYLIGHT_BUILD_TESTS @SALOME_BUILD_TESTS@)
+#SET(SALOME_PYLIGHT_BUILD_DOC   @SALOME_BUILD_DOC@)
 
 # Level 1 prerequisites:
 SET_AND_CHECK(GUI_ROOT_DIR_EXP "@PACKAGE_GUI_ROOT_DIR@")