- 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 7785201c980aa04cb935c22544c7da5c25361574..27bfe679bb63119a47ed61c06a76bb20eb0c806c 100755 (executable)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -61,8 +61,15 @@ 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 future
-#OPTION(SALOME_BUILD_TESTS "Build SALOME tests" ${SALOME_BUILD_TESTS}) For use in the future
+#OPTION(SALOME_BUILD_DOC "Generate SALOME ATOMGEN 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_PACKAGE(SalomeOmniORB REQUIRED) 
+FIND_PACKAGE(SalomeOmniORBPy REQUIRED)
 
 # Find GUI
 # ===========
@@ -70,21 +77,20 @@ 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})
 
 ##
-## ATOMGEN specifics
+## From GUI:
 ##
-FIND_PACKAGE(SalomePython REQUIRED)
-FIND_PACKAGE(SalomeOmniORB REQUIRED) 
-FIND_PACKAGE(SalomeOmniORBPy REQUIRED)
 FIND_PACKAGE(SalomeQt4 REQUIRED)
 FIND_PACKAGE(SalomeSIP REQUIRED)
 FIND_PACKAGE(SalomePyQt4 REQUIRED)
 
-# Directories
+# Directories  
 # (default values taken from KERNEL)
 # ===========
 SET(SALOME_INSTALL_BINS "${SALOME_INSTALL_BINS}" CACHE PATH "Install path: SALOME binaries")
@@ -152,6 +158,7 @@ SET(_${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

diff --git a/SalomeATOMGENConfig.cmake.in b/SalomeATOMGENConfig.cmake.in
index 2d7cca8d11965cc247d695e5cd8df51939292e7f..d60cebb12b317ab10e9b1a21f7a59745c5fad3b9 100644 (file)
--- a/SalomeATOMGENConfig.cmake.in
+++ b/SalomeATOMGENConfig.cmake.in
@@ -43,12 +43,14 @@ SET_AND_CHECK(ATOMGEN_ROOT_DIR_EXP "@PACKAGE_CMAKE_INSTALL_PREFIX@")
 
 # Include directories
 SET_AND_CHECK(ATOMGEN_INCLUDE_DIRS "${ATOMGEN_ROOT_DIR_EXP}/@SALOME_INSTALL_HEADERS@")
+SET(ATOMGEN_INCLUDE_DIRS "${ATOMGEN_INCLUDE_DIRS};@_SalomeATOMGEN_EXTRA_HEADERS@")
+SET(ATOMGEN_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_ATOMGEN_BUILD_DOC   @SALOME_BUILD_DOC@)
+#SET(SALOME_ATOMGEN_BUILD_TESTS @SALOME_BUILD_TESTS@)
 
 # Level 1 prerequisites:
 SET_AND_CHECK(GUI_ROOT_DIR_EXP  "@PACKAGE_GUI_ROOT_DIR@")