- 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 43b29bfbe0a20fe9c2fc0bcd82df16c230c581e7..2529a6019a32352136dbad7fd169fdc6e8737b4a 100755 (executable)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -45,6 +45,10 @@ ELSE(EXISTS ${KERNEL_ROOT_DIR})
   MESSAGE(FATAL_ERROR "We absolutely need a Salome KERNEL, please define KERNEL_ROOT_DIR")
 ENDIF(EXISTS ${KERNEL_ROOT_DIR})
 
+IF(SALOME_LIGHT_ONLY)
+  MESSAGE(FATAL_ERROR "ATOMGEN module can't be built in Light mode (whiout CORBA)")
+ENDIF()
+
 # Platform setup
 # ==============
 INCLUDE(SalomeSetupPlatform)   # From KERNEL
@@ -56,8 +60,16 @@ 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 ATOMSOLV 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 ATOMSOLV 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_PACKAGE(SalomePThread REQUIRED)
 
 # Find GUI
 # ===========
@@ -71,20 +83,12 @@ ELSE(EXISTS ${GUI_ROOT_DIR})
 ENDIF(EXISTS ${GUI_ROOT_DIR})
 
 ##
-## ATOMSOLV specifics
+## From GUI:
 ##
-
-FIND_PACKAGE(SalomePython REQUIRED)
-FIND_PACKAGE(SalomeOmniORB REQUIRED)
-FIND_PACKAGE(SalomeOmniORBPy REQUIRED)
-# Qt4
+FIND_PACKAGE(SalomeCAS REQUIRED)
+FIND_PACKAGE(SalomeVTK 6.0 REQUIRED)
 FIND_PACKAGE(SalomeQt4 REQUIRED COMPONENTS QtCore QtGui)
 INCLUDE(${QT_USE_FILE})
-#OCCT
-FIND_PACKAGE(SalomeCAS)
-# VTK
-FIND_PACKAGE(SalomeVTK 6.0)
-FIND_PACKAGE(SalomePthread)
 
 # Find ATOMGEN
 # ===========
@@ -92,6 +96,8 @@ SET(ATOMGEN_ROOT_DIR $ENV{ATOMGEN_ROOT_DIR} CACHE PATH "Path to the Salome ATOMG
 IF(EXISTS ${ATOMGEN_ROOT_DIR})
   LIST(APPEND CMAKE_MODULE_PATH "${ATOMGEN_ROOT_DIR}/adm_local/cmake_files")
   FIND_PACKAGE(SalomeATOMGEN REQUIRED)
+  ADD_DEFINITIONS(${ATOMGEN_DEFINITIONS})
+  INCLUDE_DIRECTORIES(${ATOMGEN_INCLUDE_DIRS})
 ELSE(EXISTS ${ATOMGEN_ROOT_DIR})
   MESSAGE(FATAL_ERROR "We absolutely need a Salome ATOMGEN, please define ATOMGEN_ROOT_DIR")
 ENDIF(EXISTS ${ATOMGEN_ROOT_DIR})
@@ -166,7 +172,6 @@ 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(ATOMGEN_ROOT_DIR "${ATOMGEN_ROOT_DIR}")
 
 SET(CONF_INCLUDE_DIRS "${PROJECT_SOURCE_DIR}/include" "${PROJECT_BINARY_DIR}/include")
@@ -174,7 +179,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
-       GUI_ROOT_DIR ATOMGEN_ROOT_DIR)
+    ATOMGEN_ROOT_DIR)
 
 WRITE_BASIC_PACKAGE_VERSION_FILE(${PROJECT_BINARY_DIR}/${PROJECT_NAME}ConfigVersion.cmake
     VERSION ${${PROJECT_NAME_UC}_VERSION}

diff --git a/SalomeATOMSOLVConfig.cmake.in b/SalomeATOMSOLVConfig.cmake.in
index ffe5922f6a9f8c3dabd584ed26ba937e18adec61..ffa41d97e3b763dca234f4b409be37d8c3b1e379 100644 (file)
--- a/SalomeATOMSOLVConfig.cmake.in
+++ b/SalomeATOMSOLVConfig.cmake.in
@@ -43,15 +43,16 @@ SET_AND_CHECK(ATOMSOLV_ROOT_DIR_EXP "@PACKAGE_CMAKE_INSTALL_PREFIX@")
 
 # Include directories
 SET_AND_CHECK(ATOMSOLV_INCLUDE_DIRS "${ATOMSOLV_ROOT_DIR_EXP}/@SALOME_INSTALL_HEADERS@")
+SET(ATOMSOLV_INCLUDE_DIRS "${ATOMSOLV_INCLUDE_DIRS};@_SalomeATOMSOLV_EXTRA_HEADERS@")
+SET(ATOMSOLV_DEFINITIONS "@ATOMGEN_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_ATOMSOLV_BUILD_DOC   @SALOME_BUILD_DOC@)
+#SET(SALOME_ATOMSOLV_BUILD_TESTS @SALOME_BUILD_TESTS@)
 
 # Level 1 prerequisites:
-SET_AND_CHECK(GUI_ROOT_DIR_EXP "@PACKAGE_GUI_ROOT_DIR@")
 SET_AND_CHECK(ATOMGEN_ROOT_DIR_EXP "@PACKAGE_ATOMGEN_ROOT_DIR@")
 
 # For all prerequisites, load the corresponding targets if the package was used 
@@ -90,13 +91,8 @@ SET(SALOME_INSTALL_RES "@SALOME_INSTALL_RES@")
 SET(SALOME_INSTALL_DOC "@SALOME_INSTALL_DOC@")
 SET(SALOME_INSTALL_AMCONFIG_LOCAL "@SALOME_INSTALL_AMCONFIG_LOCAL@")
 
-# Include GUI targets if they were not already loaded:
-IF(NOT (TARGET Event)) 
-  INCLUDE("${GUI_ROOT_DIR_EXP}/${SALOME_INSTALL_CMAKE_LOCAL}/SalomeGUITargets.cmake")
-ENDIF()
-
 # Include ATOMGEN targets if they were not already loaded:
-IF(NOT (TARGET SALOMEBasics)) 
+IF(NOT (TARGET SalomeIDLATOMGEN)) 
   INCLUDE("${ATOMGEN_ROOT_DIR_EXP}/${SALOME_INSTALL_CMAKE_LOCAL}/SalomeATOMGENTargets.cmake")
 ENDIF()