- 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 4b4ed53854d1de7e8752fadef76c3b2b499c95c6..8fb591d919729139afb6830183bafd8408c05c2e 100755 (executable)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -60,8 +60,8 @@ 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 SIERPINSKY 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 SIERPINSKY documentation" ON) #For use in the future
 
 OPTION(SALOME_SIERPINSKY_USE_LIBGD "Enable export to JPEG" ON)
 MARK_AS_ADVANCED(SALOME_SIERPINSKY_USE_LIBGD)
@@ -88,6 +88,8 @@ 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})
@@ -99,8 +101,10 @@ ENDIF(EXISTS ${GUI_ROOT_DIR})
 # Various
 # Qt4
 FIND_PACKAGE(SalomeQt4 REQUIRED COMPONENTS QtCore QtGui)
+# OCCT
+FIND_PACKAGE(SalomeCAS REQUIRED)
 # VTK
-FIND_PACKAGE(SalomeVTK 6.0)
+FIND_PACKAGE(SalomeVTK 6.0 REQUIRED)
 
 # Find RANDOMIZER
 # ===========
@@ -109,6 +113,8 @@ SET(RANDOMIZER_ROOT_DIR $ENV{RANDOMIZER_ROOT_DIR} CACHE PATH "Path to the Salome
 IF(EXISTS ${RANDOMIZER_ROOT_DIR})
   LIST(APPEND CMAKE_MODULE_PATH "${RANDOMIZER_ROOT_DIR}/adm_local/cmake_files")
   FIND_PACKAGE(SalomeRANDOMIZER REQUIRED)
+  ADD_DEFINITIONS(${RANDOMIZER_DEFINITIONS})
+  INCLUDE_DIRECTORIES(${RANDOMIZER_INCLUDE_DIRS})
 ELSE(EXISTS ${RANDOMIZER_ROOT_DIR})
   MESSAGE(FATAL_ERROR "We absolutely need a Salome RANDOMIZER, please define RANDOMIZER_ROOT_DIR")
 ENDIF(EXISTS ${RANDOMIZER_ROOT_DIR})
@@ -120,6 +126,8 @@ SET(SMESH_ROOT_DIR $ENV{SMESH_ROOT_DIR} CACHE PATH "Path to the Salome SMESH")
 IF(EXISTS ${SMESH_ROOT_DIR})
   LIST(APPEND CMAKE_MODULE_PATH "${SMESH_ROOT_DIR}/adm_local/cmake_files")
   FIND_PACKAGE(SalomeSMESH REQUIRED)
+  ADD_DEFINITIONS(${SMESH_DEFINITIONS})
+  INCLUDE_DIRECTORIES(${SMESH_INCLUDE_DIRS})
 ELSE(EXISTS ${SMESH_ROOT_DIR})
   MESSAGE(FATAL_ERROR "We absolutely need a Salome SMESH, please define SMESH_ROOT_DIR")
 ENDIF(EXISTS ${SMESH_ROOT_DIR})
@@ -128,11 +136,9 @@ ENDIF(EXISTS ${SMESH_ROOT_DIR})
 ## SIERPINSKY specifics
 ##
 
-# OCCT
-FIND_PACKAGE(SalomeCAS REQUIRED)
 # libgd
 IF(SALOME_SIERPINSKY_USE_LIBGD)
-  FIND_PACKAGE(SalomeLibGd REQUIRED)
+  FIND_PACKAGE(SalomeLibGd)
   SALOME_LOG_OPTIONAL_PACKAGE(LibGd SALOME_SIERPINSKY_USE_LIBGD)
   ADD_DEFINITIONS(-DWITH_LIBGD)
 ENDIF(SALOME_SIERPINSKY_USE_LIBGD)
@@ -212,6 +218,7 @@ EXPORT(TARGETS ${_${PROJECT_NAME}_exposed_targets}
 
 # Ensure the variables are always defined for the configure:
 SET(SMESH_ROOT_DIR "${SMESH_ROOT_DIR}")
+SET(RANDOMIZER_ROOT_DIR "${RANDOMIZER_ROOT_DIR}")
 SET(LIBGD_ROOT_DIR "${LIBGD_ROOT_DIR}")
  
 SET(CONF_INCLUDE_DIRS "${PROJECT_SOURCE_DIR}/include" "${PROJECT_BINARY_DIR}/include")
@@ -219,7 +226,7 @@ CONFIGURE_PACKAGE_CONFIG_FILE(${PROJECT_NAME}Config.cmake.in
     ${PROJECT_BINARY_DIR}/${PROJECT_NAME}Config.cmake
     INSTALL_DESTINATION "${SALOME_INSTALL_CMAKE_LOCAL}"
     PATH_VARS CONF_INCLUDE_DIRS SALOME_INSTALL_CMAKE_LOCAL CMAKE_INSTALL_PREFIX
-    SMESH_ROOT_DIR LIBGD_ROOT_DIR)
+    SMESH_ROOT_DIR LIBGD_ROOT_DIR RANDOMIZER_ROOT_DIR)
 
 WRITE_BASIC_PACKAGE_VERSION_FILE(${PROJECT_BINARY_DIR}/${PROJECT_NAME}ConfigVersion.cmake
     VERSION ${${PROJECT_NAME_UC}_VERSION}

diff --git a/SalomeSIERPINSKYConfig.cmake.in b/SalomeSIERPINSKYConfig.cmake.in
index 911a050f576f9635ade677fb830093dd1d79963e..201945da83efe3605c28b2121cc6845473ca7fd4 100644 (file)
--- a/SalomeSIERPINSKYConfig.cmake.in
+++ b/SalomeSIERPINSKYConfig.cmake.in
@@ -43,19 +43,22 @@ SET_AND_CHECK(SIERPINSKY_ROOT_DIR_EXP "@PACKAGE_CMAKE_INSTALL_PREFIX@")
 
 # Include directories
 SET_AND_CHECK(SIERPINSKY_INCLUDE_DIRS "${SIERPINSKY_ROOT_DIR_EXP}/@SALOME_INSTALL_HEADERS@")
+SET(SIERPINSKY_INCLUDE_DIRS "${SIERPINSKY_INCLUDE_DIRS};@_SalomeSIERPINSKY_EXTRA_HEADERS@")
+SET(SIERPINSKY_DEFINITIONS "@SMESH_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_SIERPINSKY_BUILD_TESTS @SALOME_BUILD_TESTS@)
+#SET(SALOME_SIERPINSKY_BUILD_DOC   @SALOME_BUILD_DOC@)
 SET(SALOME_SIERPINSKY_USE_LIBGD @SALOME_SIERPINSKY_USE_LIBGD@)
 
 # Level 1 prerequisites:
 SET_AND_CHECK(SMESH_ROOT_DIR_EXP "@PACKAGE_SMESH_ROOT_DIR@")
+SET_AND_CHECK(RANDOMIZER_ROOT_DIR_EXP "@PACKAGE_RANDOMIZER_ROOT_DIR@")
 IF(SALOME_SIERPINSKY_USE_LIBGD)
   SET_AND_CHECK(LIBGD_ROOT_DIR_EXP "@PACKAGE_LIBGD_ROOT_DIR@")
-  ADD_DEFINITIONS(-DWITH_LIBGD)
+  LIST(APPEND SIERPINSKY_DEFINITIONS "-DWITH_LIBGD")
 ENDIF()
 
 # For all prerequisites, load the corresponding targets if the package was used 
@@ -99,6 +102,11 @@ IF(NOT (TARGET SMESHEngine))
   INCLUDE("${SMESH_ROOT_DIR_EXP}/${SALOME_INSTALL_CMAKE}/SalomeSMESHTargets.cmake")
 ENDIF()
 
+# Include RANDOMIZER targets if they were not already loaded:
+IF(NOT (TARGET SalomeIDLRANDOMIZER))
+  INCLUDE("${RANDOMIZER_ROOT_DIR_EXP}/${SALOME_INSTALL_CMAKE}/SalomeRANDOMIZERTargets.cmake")
+ENDIF()
+
 # Exposed SIERPINSKY targets:
 SET(SIERPINSKY_SIERPINSKYEngine SIERPINSKYEngine)
 SET(SIERPINSKY_SIERPINSKY SIERPINSKY)