Salome HOME
ATOMIC porting to CMake build system : some corrections.
authorrnv <rnv@opencascade.com>
Fri, 20 Sep 2013 12:16:06 +0000 (12:16 +0000)
committerrnv <rnv@opencascade.com>
Fri, 20 Sep 2013 12:16:06 +0000 (12:16 +0000)
CMakeLists.txt

index 88281dedc471be95c369ebd1ee929f4378d7a47b..778922ab9c68d668c6d56da69d80213e154692d6 100755 (executable)
@@ -141,7 +141,7 @@ INCLUDE(CMakePackageConfigHelpers)
 # List of targets in this project we want to make visible to the rest of the world.
 # They all have to be INSTALL'd with the option "EXPORT ${PROJECT_NAME}TargetGroup"
 SET(_${PROJECT_NAME}_exposed_targets 
-  ATOMGEN ATOMGENGUI SalomeIDLATOMGEN
+  SalomeIDLATOMGEN
 )
 
 # Add all targets to the build-tree export set
@@ -153,19 +153,12 @@ SET(_${PROJECT_NAME}_exposed_targets
 
 # Ensure the variables are always defined for the configure:
 
-SET(PYTHON_ROOT_DIR "${PYTHON_ROOT_DIR}")
-SET(OMNIORB_ROOT_DIR "${OMNIORB_ROOT_DIR}")
-SET(OMNIORBPY_ROOT_DIR "${OMNIORBPY_ROOT_DIR}")
-SET(QT4_ROOT_DIR "${QT4_ROOT_DIR}")
-SET(SIP_ROOT_DIR "${SIP_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 PYTHON_ROOT_DIR OMNIORB_ROOT_DIR OMNIORBPY_ROOT_DIR QT4_ROOT_DIR SIP_ROOT_DIR PYQT4_ROOT_DIR)
+    GUI_ROOT_DIR)
 
 WRITE_BASIC_PACKAGE_VERSION_FILE(${PROJECT_BINARY_DIR}/${PROJECT_NAME}ConfigVersion.cmake
     VERSION ${${PROJECT_NAME_UC}_VERSION}