- 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 be30c2783fa0ed76b443b27b4acc0f382b5dbf12..d72e86defc9a602fbfdb9b3790d693cf81ab3b41 100755 (executable)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -41,6 +41,8 @@ IF(EXISTS ${KERNEL_ROOT_DIR})
   LIST(APPEND CMAKE_MODULE_PATH "${KERNEL_ROOT_DIR}/salome_adm/cmake_files")
   INCLUDE(SalomeMacros)
   FIND_PACKAGE(SalomeKERNEL REQUIRED)
+  ADD_DEFINITIONS(${KERNEL_DEFINITIONS})
+  INCLUDE_DIRECTORIES(${KERNEL_INCLUDE_DIRS})
 ELSE(EXISTS ${KERNEL_ROOT_DIR})
   MESSAGE(FATAL_ERROR "We absolutely need a Salome KERNEL, please define KERNEL_ROOT_DIR")
 ENDIF(EXISTS ${KERNEL_ROOT_DIR})
@@ -60,13 +62,12 @@ 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 COMPONENT documentation" ${SALOME_BUILD_DOC}) For use in the future
-  
+# OPTION(SALOME_BUILD_DOC "Generate SALOME COMPONENT documentation" ON) #for use in the future
+# OPTION(SALOME_BUILD_TESTS "Build SALOME tests" ON) #for use in the future
+
 ##
-## COMPONENT specifics
+## From KERNEL:
 ##
-
 # Python
 FIND_PACKAGE(SalomePython REQUIRED)
 # SWIG

diff --git a/SalomeCOMPONENTConfig.cmake.in b/SalomeCOMPONENTConfig.cmake.in
index 466e0def33105afe5b99c2f2bbe6aa74bc3c95f6..22bb14a04aecc968d31eca55411b842a4037c4b2 100644 (file)
--- a/SalomeCOMPONENTConfig.cmake.in
+++ b/SalomeCOMPONENTConfig.cmake.in
@@ -43,12 +43,14 @@ SET_AND_CHECK(COMPONENT_ROOT_DIR_EXP "@PACKAGE_CMAKE_INSTALL_PREFIX@")
 
 # Include directories
 SET_AND_CHECK(COMPONENT_INCLUDE_DIRS "${COMPONENT_ROOT_DIR_EXP}/@SALOME_INSTALL_HEADERS@")
+SET(COMPONENT_INCLUDE_DIRS "${COMPONENT_INCLUDE_DIRS};@_SalomeCOMPONENT_EXTRA_HEADERS@")
+SET(COMPONENT_DEFINITIONS "@KERNEL_DEFINITIONS@")
 
 #### Now the specificities
 
 # Options exported by the package:
-#SET(SALOME_BUILD_DOC   @SALOME_BUILD_DOC@)
-#SET(SALOME_BUILD_TESTS @SALOME_BUILD_TESTS@)
+#SET(SALOME_COMPONENT_BUILD_DOC   @SALOME_BUILD_DOC@)
+#SET(SALOME_COMPONENT_BUILD_TESTS @SALOME_BUILD_TESTS@)
 
 # Level 1 prerequisites:
 SET_AND_CHECK(KERNEL_ROOT_DIR_EXP "@PACKAGE_KERNEL_ROOT_DIR@")