- 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 adeb0d64918f8da498026853d18ddebd1c56b04f..8309f0c14fc7d00ac484e21677ac4ec90e9db6c9 100755 (executable)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -56,9 +56,15 @@ 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 LIGHT documentation" ${SALOME_BUILD_DOC}) For use in the future
-  
+# OPTION(SALOME_BUILD_DOC "Generate SALOME LIGHT documentation" ON) #For use in the future
+# OPTION(SALOME_BUILD_TESTS "Build SALOME tests" ON) #For use in the future  
+
+##
+## From KERNEL:
+##
+# Python
+FIND_PACKAGE(SalomePython REQUIRED)
+
 # Find GUI
 # ===========
 
@@ -66,23 +72,22 @@ 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})
 
 ##
-## LIGHT specifics
+## From GUI:
 ##
-
-# Python
-FIND_PACKAGE(SalomePython REQUIRED)
 # Qt4
 FIND_PACKAGE(SalomeQt4 REQUIRED COMPONENTS QtCore QtGui)
 INCLUDE(${QT_USE_FILE})
 # OCCT
-FIND_PACKAGE(SalomeCAS)
+FIND_PACKAGE(SalomeCAS REQUIRED)
 # VTK
-FIND_PACKAGE(SalomeVTK 6.0)
+FIND_PACKAGE(SalomeVTK 6.0 REQUIRED)
 
 # Directories
 # (default values taken from KERNEL)

diff --git a/SalomeLIGHTConfig.cmake.in b/SalomeLIGHTConfig.cmake.in
index 4b7c74e1d24204adfa24e4c8daf881003844d599..7ccc6ad4a91c2130c1870dc1eea315c2e8e73ea4 100644 (file)
--- a/SalomeLIGHTConfig.cmake.in
+++ b/SalomeLIGHTConfig.cmake.in
@@ -43,12 +43,13 @@ SET_AND_CHECK(LIGHT_ROOT_DIR_EXP "@PACKAGE_CMAKE_INSTALL_PREFIX@")
 
 # Include directories
 SET_AND_CHECK(LIGHT_INCLUDE_DIRS "${LIGHT_ROOT_DIR_EXP}/@SALOME_INSTALL_HEADERS@")
-
+SET(LIGHT_INCLUDE_DIRS "${LIGHT_INCLUDE_DIRS};@_SalomeLIGHT_EXTRA_HEADERS@")
+SET(LIGHT_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_LIGHT_BUILD_TESTS @SALOME_BUILD_TESTS@)
+#SET(SALOME_LIGHT_BUILD_DOC   @SALOME_BUILD_DOC@)
 
 # Level 1 prerequisites:
 SET_AND_CHECK(GUI_ROOT_DIR_EXP "@PACKAGE_GUI_ROOT_DIR@")