ATOMGEN porting to CMake build system : some corrections.

diff --git a/adm_local/cmake_files/SalomeATOMGENConfig.cmake.in b/adm_local/cmake_files/SalomeATOMGENConfig.cmake.in
index 558b811cb3fa042a1af1e3e389f1b5dcdfe4a240..2b7dead14bfc924fe57e334aac7682d530e99626 100644 (file)
--- a/adm_local/cmake_files/SalomeATOMGENConfig.cmake.in
+++ b/adm_local/cmake_files/SalomeATOMGENConfig.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 SalomeIDLATOMGEN AND NOT @PROJECT_NAME@_BINARY_DIR)
   INCLUDE("@PACKAGE_SALOME_INSTALL_CMAKE_LOCAL@/@PROJECT_NAME@Targets.cmake")
 ENDIF()
 
@@ -51,18 +51,13 @@ SET_AND_CHECK(ATOMGEN_INCLUDE_DIRS "${ATOMGEN_ROOT_DIR_EXP}/@SALOME_INSTALL_HEAD
 #SET(SALOME_BUILD_TESTS @SALOME_BUILD_TESTS@)
 
 # Level 1 prerequisites:
-SET_AND_CHECK(PYTHON_ROOT_DIR_EXP   "@PACKAGE_PYTHON_ROOT_DIR@")
-SET_AND_CHECK(OMNIORB_ROOT_DIR_EXP  "@PACKAGE_OMNIORB_ROOT_DIR@")
-SET_AND_CHECK(OMNIORBPY_ROOT_DIR_EXP "@PACKAGE_OMNIORBPY_ROOT_DIR@")
-SET_AND_CHECK(QT4_ROOT_DIR_EXP "@PACKAGE_QT4_ROOT_DIR@")
-SET_AND_CHECK(SIP_ROOT_DIR_EXP "@PACKAGE_SIP_ROOT_DIR@")
-SET_AND_CHECK(PYQT4_ROOT_DIR_EXP "@PACKAGE_PYQT4_ROOT_DIR@")
+SET_AND_CHECK(GUI_ROOT_DIR_EXP  "@PACKAGE_GUI_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 Python omniORB Qt4 SIP PyQt4)
-SET(_PREREQ_CONFIG_DIR "@Python_DIR@" "@omniORB_DIR@" "@Qt4_DIR@" "@SIP_DIR@" "@PyQt4_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,10 +89,10 @@ 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 ATOMGEN targets:
-SET(ATOMGEN_SalomeIDLATOMGEN ${SalomeIDLATOMGEN})
\ No newline at end of file
+SET(ATOMGEN_SalomeIDLATOMGEN SalomeIDLATOMGEN)
\ No newline at end of file