From e5a325fb22447700d0b72e212018c3fe93b70093 Mon Sep 17 00:00:00 2001 From: rnv Date: Mon, 14 Oct 2013 07:24:35 +0000 Subject: [PATCH] Porting ATOMGEN SALOME module build procedure to the CMake build system: some corrections: 1) Move module configuration file to the root directory. 2) Remove deprecated files. --- CMakeLists.txt | 2 +- ...g.cmake.in => SalomeATOMGENConfig.cmake.in | 2 +- adm_local/cmake_files/CMakeLists.txt | 1 - adm_local/cmake_files/FindATOMGEN.cmake | 25 ------------------- 4 files changed, 2 insertions(+), 28 deletions(-) rename adm_local/cmake_files/SalomeATOMGENConfig.cmake.in => SalomeATOMGENConfig.cmake.in (97%) delete mode 100644 adm_local/cmake_files/FindATOMGEN.cmake diff --git a/CMakeLists.txt b/CMakeLists.txt index 778922a..7785201 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -154,7 +154,7 @@ SET(_${PROJECT_NAME}_exposed_targets # Ensure the variables are always defined for the configure: 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 +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 diff --git a/adm_local/cmake_files/SalomeATOMGENConfig.cmake.in b/SalomeATOMGENConfig.cmake.in similarity index 97% rename from adm_local/cmake_files/SalomeATOMGENConfig.cmake.in rename to SalomeATOMGENConfig.cmake.in index 2b7dead..2d7cca8 100644 --- a/adm_local/cmake_files/SalomeATOMGENConfig.cmake.in +++ b/SalomeATOMGENConfig.cmake.in @@ -1,5 +1,5 @@ # - Config file for the @PROJECT_NAME@ package -# It defines the following variables. +# It defines the following variables. # Specific to the pacakge @PROJECT_NAME@ itself: # @PROJECT_NAME_UC@_ROOT_DIR_EXP - the root path of the installation providing this CMake file # diff --git a/adm_local/cmake_files/CMakeLists.txt b/adm_local/cmake_files/CMakeLists.txt index d4154d8..4e4a416 100755 --- a/adm_local/cmake_files/CMakeLists.txt +++ b/adm_local/cmake_files/CMakeLists.txt @@ -24,6 +24,5 @@ # These files are data, module or lib files SET(_adm_data FindSalomeATOMGEN.cmake - FindATOMGEN.cmake ) INSTALL(FILES ${_adm_data} DESTINATION ${SALOME_INSTALL_CMAKE_LOCAL}) diff --git a/adm_local/cmake_files/FindATOMGEN.cmake b/adm_local/cmake_files/FindATOMGEN.cmake deleted file mode 100644 index eba602f..0000000 --- a/adm_local/cmake_files/FindATOMGEN.cmake +++ /dev/null @@ -1,25 +0,0 @@ -# Copyright (C) 2007-2013 CEA/DEN, EDF R&D, OPEN CASCADE -# -# This library is free software; you can redistribute it and/or -# modify it under the terms of the GNU Lesser General Public -# License as published by the Free Software Foundation; either -# version 2.1 of the License. -# -# This library is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -# -# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com -# - - -SET(ATOMGEN_CXXFLAGS -I${ATOMGEN_ROOT_DIR}/include/salome) # to be removed -SET(ATOMGEN_INCLUDE_DIRS ${ATOMGEN_ROOT_DIR}/include/salome) - - -FIND_LIBRARY(ATOMGEN_SalomeIDLATOMGEN SalomeIDLATOMGEN ${ATOMGEN_ROOT_DIR}/lib/salome) \ No newline at end of file -- 2.39.2