- 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 1867647bfb87edf3a22701639b1a4c9813c93626..fbf083b019b19d2c362990a33cf4c08c8e105236 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -56,8 +56,13 @@ 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_DOC "Generate SALOME ATOMGEN documentation" ${SALOME_BUILD_DOC}) For use in the fiature
-# OPTION(SALOME_BUILD_TESTS "Build SALOME tests" ${SALOME_BUILD_TESTS}) For use in the fiature
+#OPTION(SALOME_BUILD_DOC "Generate SALOME ATOMIC documentation" ON) #for use in the future
+#OPTION(SALOME_BUILD_TESTS "Build SALOME tests" ON) #for use in the future
+
+##
+## From KERNEL:
+##
+FIND_PACKAGE(SalomePython REQUIRED)
 
 # Find GUI
 # ===========
@@ -65,19 +70,18 @@ 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})
 
 ##
-## ATOMIC specifics
+## From GUI:
 ##
-
-FIND_PACKAGE(SalomePython REQUIRED)
 FIND_PACKAGE(SalomeCAS REQUIRED)
 FIND_PACKAGE(SalomeSIP REQUIRED)  # should come after Python and before PyQt4
 FIND_PACKAGE(SalomePyQt4 REQUIRED) 
-# Qt4
 FIND_PACKAGE(SalomeQt4 REQUIRED COMPONENTS QtCore QtGui)
 INCLUDE(${QT_USE_FILE})
 
@@ -149,14 +153,14 @@ EXPORT(TARGETS ${_${PROJECT_NAME}_exposed_targets}
 #   - in the build tree:
 
 # Ensure the variables are always defined for the configure:
-
+SET(GUI_ROOT_DIR "${GUI_ROOT_DIR}")
 
 SET(CONF_INCLUDE_DIRS "${PROJECT_SOURCE_DIR}/include" "${PROJECT_BINARY_DIR}/include")
 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
-       GUI_ROOT_DIR)
+    GUI_ROOT_DIR)
 
 WRITE_BASIC_PACKAGE_VERSION_FILE(${PROJECT_BINARY_DIR}/${PROJECT_NAME}ConfigVersion.cmake
     VERSION ${${PROJECT_NAME_UC}_VERSION}

diff --git a/SalomeATOMICConfig.cmake.in b/SalomeATOMICConfig.cmake.in
index 52a43088f4b96d4d256cc4741cc8a687a1bc2957..133aa20e27d4db9a185215871a87aa0e6e3af8d1 100644 (file)
--- a/SalomeATOMICConfig.cmake.in
+++ b/SalomeATOMICConfig.cmake.in
@@ -43,12 +43,14 @@ SET_AND_CHECK(ATOMIC_ROOT_DIR_EXP "@PACKAGE_CMAKE_INSTALL_PREFIX@")
 
 # Include directories
 SET_AND_CHECK(ATOMIC_INCLUDE_DIRS "${ATOMIC_ROOT_DIR_EXP}/@SALOME_INSTALL_HEADERS@")
+SET(ATOMIC_INCLUDE_DIRS "${ATOMIC_INCLUDE_DIRS};@_SalomeATOMIC_EXTRA_HEADERS@")
+SET(ATOMIC_DEFINITIONS "@GUI_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_ATOMIC_BUILD_DOC   @SALOME_BUILD_DOC@)
+#SET(SALOME_ATOMIC_BUILD_TESTS @SALOME_BUILD_TESTS@)
 SET(SALOME_LIGHT_ONLY  @SALOME_LIGHT_ONLY@)
 
 # Level 1 prerequisites: