- 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 4d239637854c129437109c0370c17b2b9750df8f..48358e2b17d0c83efa21f397de9277edfe45d83f 100755 (executable)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -60,13 +60,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 RANDOMIZER 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 RANDOMIZER documentation" ON)
 
 ##
-## RANDOMIZER specifics
+## From KERNEL:
 ##
-
 FIND_PACKAGE(SalomePython REQUIRED)
 FIND_PACKAGE(SalomeOmniORB REQUIRED)
 FIND_PACKAGE(SalomeOmniORBPy REQUIRED)

diff --git a/SalomeRANDOMIZERConfig.cmake.in b/SalomeRANDOMIZERConfig.cmake.in
index 59f856ad3322e1391f80aa7ee7af3b0ac2b37eaa..06690d2ba309d146133b7886ff116417b9c3454c 100644 (file)
--- a/SalomeRANDOMIZERConfig.cmake.in
+++ b/SalomeRANDOMIZERConfig.cmake.in
@@ -37,6 +37,8 @@ SET_AND_CHECK(RANDOMIZER_ROOT_DIR_EXP "@PACKAGE_CMAKE_INSTALL_PREFIX@")
 
 # Include directories
 SET_AND_CHECK(RANDOMIZER_INCLUDE_DIRS "${RANDOMIZER_ROOT_DIR_EXP}/@SALOME_INSTALL_HEADERS@")
+SET(RANDOMIZER_INCLUDE_DIRS "${RANDOMIZER_INCLUDE_DIRS};@_SalomeRANDOMIZER_EXTRA_HEADERS@")
+SET(RANDOMIZER_DEFINITIONS "@KERNEL_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_RANDOMIZER_BUILD_TESTS @SALOME_BUILD_TESTS@)
+#SET(SALOME_RANDOMIZER_BUILD_DOC   @SALOME_BUILD_DOC@)
 
 # Level 1 prerequisites:
 SET_AND_CHECK(KERNEL_ROOT_DIR_EXP "@PACKAGE_KERNEL_ROOT_DIR@")