- 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 02ea12e359870f0ec87b354d0cf9d38bc8792246..00ed638c8fd140b21930e4715c0c998d765bd538 100755 (executable)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -60,13 +60,20 @@ 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 PYCALCULATOR documentation" ${SALOME_BUILD_DOC})
+# OPTION(SALOME_BUILD_TESTS "Build SALOME tests" ON) For use in the future
+OPTION(SALOME_BUILD_DOC "Generate SALOME PYCALCULATOR documentation" ON)
   
 IF(SALOME_BUILD_DOC)
   FIND_PACKAGE(SalomeDoxygen)
   SALOME_LOG_OPTIONAL_PACKAGE(Doxygen SALOME_BUILD_DOC)
 ENDIF()
+
+##
+## From KERNEL:
+##
+FIND_PACKAGE(SalomePython REQUIRED)
+FIND_PACKAGE(SalomeOmniORB REQUIRED)
+FIND_PACKAGE(SalomeOmniORBPy REQUIRED)
   
 # Find MED
 # ===========
@@ -79,14 +86,6 @@ ELSE(EXISTS ${MED_ROOT_DIR})
   MESSAGE(FATAL_ERROR "We absolutely need a Salome MED, please define MED_ROOT_DIR")
 ENDIF(EXISTS ${MED_ROOT_DIR})
 
-##
-## PYCALCULATOR specifics
-##
-
-FIND_PACKAGE(SalomePython REQUIRED)
-FIND_PACKAGE(SalomeOmniORB REQUIRED)
-FIND_PACKAGE(SalomeOmniORBPy REQUIRED)
-
 # Detection summary:
 SALOME_PACKAGE_REPORT_AND_CHECK()
 

diff --git a/SalomePYCALCULATORConfig.cmake.in b/SalomePYCALCULATORConfig.cmake.in
index 404a8aaf847dc194fced51d6707d8ba2a0a83c24..838ba9b2233894ae422dd862312f6da42de41e66 100644 (file)
--- a/SalomePYCALCULATORConfig.cmake.in
+++ b/SalomePYCALCULATORConfig.cmake.in
@@ -37,6 +37,8 @@ SET_AND_CHECK(PYCALCULATOR_ROOT_DIR_EXP "@PACKAGE_CMAKE_INSTALL_PREFIX@")
 
 # Include directories
 SET_AND_CHECK(PYCALCULATOR_INCLUDE_DIRS "${PYCALCULATOR_ROOT_DIR_EXP}/@SALOME_INSTALL_HEADERS@")
+SET(PYCALCULATOR_INCLUDE_DIRS "${PYCALCULATOR_INCLUDE_DIRS};@_SalomePYCALCULATOR_EXTRA_HEADERS@")
+SET(PYCALCULATOR_DEFINITIONS "@MED_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_PYCALCULATOR_BUILD_TESTS @SALOME_BUILD_TESTS@)
+SET(SALOME_PYCALCULATOR_BUILD_DOC   @SALOME_BUILD_DOC@)
 
 # Level 1 prerequisites:
 SET_AND_CHECK(MED_ROOT_DIR_EXP  "@PACKAGE_MED_ROOT_DIR@")