From: mpa <mpa@opencascade.com>
Date: Wed, 23 Oct 2013 06:22:09 +0000 (+0000)
Subject: - SALOME_BUILD_DOC, SALOME_BUILD_TESTS should be independent in each module
X-Git-Tag: V7_3_0a1~5
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=1e25737c0e5ed719468c5fb0da15b784afd06117;p=samples%2Frandomizer.git

- 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 4d23963..48358e2 100755
--- 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 59f856a..06690d2 100644
--- 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@")