From: rnv Date: Fri, 20 Sep 2013 12:16:06 +0000 (+0000) Subject: ATOMIC porting to CMake build system : some corrections. X-Git-Tag: V7_3_0a1~11 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=7e0a6806fa510ec814f82e4b0e578c0fee957997;p=samples%2Fatomgen.git ATOMIC porting to CMake build system : some corrections. --- diff --git a/CMakeLists.txt b/CMakeLists.txt index 88281de..778922a 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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}