ATOMIC porting to CMake build system : some corrections.

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 70ce09c59e7e14c6812f0348790554f796a5bd2b..004049678f86d0f8b2ccc0ef1f59eb7ee4e21195 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -149,18 +149,14 @@ EXPORT(TARGETS ${_${PROJECT_NAME}_exposed_targets}
 #   - in the build tree:
 
 # Ensure the variables are always defined for the configure:
-SET(SIP_ROOT_DIR "${SIP_ROOT_DIR}")
-SET(GUI_ROOT_DIR "${GUI_ROOT_DIR}")
-SET(QT4_ROOT_DIR "${QT4_ROOT_DIR}")
-SET(CAS_ROOT_DIR "${CAS_ROOT_DIR}")
-SET(PYQT4_ROOT_DIR "${PYQT4_ROOT_DIR}")
- 
+
+
 SET(CONF_INCLUDE_DIRS "${PROJECT_SOURCE_DIR}/include" "${PROJECT_BINARY_DIR}/include")
 CONFIGURE_PACKAGE_CONFIG_FILE(adm_local/cmake_files/${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
-       KERNEL_ROOT_DIR GUI_ROOT_DIR SIP_ROOT_DIR QT4_ROOT_DIR PYQT4_ROOT_DIR CAS_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/adm_local/cmake_files/SalomeATOMICConfig.cmake.in b/adm_local/cmake_files/SalomeATOMICConfig.cmake.in
index 755c812b2038852a0ebdc5380f372e912829c044..9a06c2b68ded5598ef3f599e20652f98ac8f331f 100644 (file)
--- a/adm_local/cmake_files/SalomeATOMICConfig.cmake.in
+++ b/adm_local/cmake_files/SalomeATOMICConfig.cmake.in
@@ -34,7 +34,7 @@
 # Load the dependencies for the libraries of @PROJECT_NAME@ 
 # (contains definitions for IMPORTED targets). This is only 
 # imported if we are not built as a subproject (in this case targets are already there)
-IF(NOT TARGET Event AND NOT @PROJECT_NAME@_BINARY_DIR)
+IF(NOT TARGET AtomicPy AND NOT @PROJECT_NAME@_BINARY_DIR)
   INCLUDE("@PACKAGE_SALOME_INSTALL_CMAKE@/@PROJECT_NAME@Targets.cmake")
 ENDIF()   
 
@@ -52,18 +52,13 @@ SET(SALOME_BUILD_TESTS @SALOME_BUILD_TESTS@)
 SET(SALOME_LIGHT_ONLY  @SALOME_LIGHT_ONLY@)
 
 # Level 1 prerequisites:
-SET_AND_CHECK(KERNEL_ROOT_DIR_EXP "@PACKAGE_KERNEL_ROOT_DIR@")
 SET_AND_CHECK(GUI_ROOT_DIR_EXP "@PACKAGE_GUI_ROOT_DIR@")
-SET_AND_CHECK(CAS_ROOT_DIR_EXP "@PACKAGE_CAS_ROOT_DIR@")
-SET_AND_CHECK(SIP_ROOT_DIR_EXP "@PACKAGE_SIP_ROOT_DIR@")
-SET_AND_CHECK(QT4_ROOT_DIR_EXP "@PACKAGE_QT4_ROOT_DIR@")
-SET_AND_CHECK(PYQT4_ROOT_DIR_EXP "@PACKAGE_PYQT4_ROOT_DIR@")
 
 # For all prerequisites, load the corresponding targets if the package was used 
 # in CONFIG mode. This ensures dependent projects link correctly
 # without having to set LD_LIBRARY_PATH:
-SET(_PREREQ CAS PyQt4 Qt4 SIP)
-SET(_PREREQ_CONFIG_DIR "@CAS_DIR@" "@PyQt4_DIR@" "@Qt4_DIR@" "@SIP_DIR@")
+SET(_PREREQ )
+SET(_PREREQ_CONFIG_DIR )
 LIST(LENGTH _PREREQ_CONFIG_DIR _list_len)
 # Another CMake stupidity - FOREACH(... RANGE r) generates r+1 numbers ...
 MATH(EXPR _range "${_list_len}-1")
@@ -94,9 +89,9 @@ SET(SALOME_INSTALL_RES "@SALOME_INSTALL_RES@")
 SET(SALOME_INSTALL_DOC "@SALOME_INSTALL_DOC@")
 SET(SALOME_INSTALL_AMCONFIG_LOCAL "@SALOME_INSTALL_AMCONFIG_LOCAL@")
 
-# Include KERNEL targets if they were not already loaded:
-IF(NOT (TARGET SALOMEBasics)) 
-  INCLUDE("${KERNEL_ROOT_DIR_EXP}/${SALOME_INSTALL_CMAKE}/SalomeKERNELTargets.cmake")
+# 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()
 
 # Exposed ATOMIC targets: