From 3fec2fb73169ac861ecbf0b8b252aeee4d74bbc8 Mon Sep 17 00:00:00 2001 From: rnv Date: Fri, 11 Oct 2013 14:31:52 +0000 Subject: [PATCH] Porting RANDOMIZER 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 | 4 ++-- ...make.in => SalomeRANDOMIZERConfig.cmake.in | 0 adm_local/cmake_files/CMakeLists.txt | 1 - adm_local/cmake_files/FindRANDOMIZER.cmake | 24 ------------------- 4 files changed, 2 insertions(+), 27 deletions(-) rename adm_local/cmake_files/SalomeRANDOMIZERConfig.cmake.in => SalomeRANDOMIZERConfig.cmake.in (100%) delete mode 100644 adm_local/cmake_files/FindRANDOMIZER.cmake diff --git a/CMakeLists.txt b/CMakeLists.txt index 4e222be..4d23963 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -140,7 +140,7 @@ EXPORT(TARGETS ${_${PROJECT_NAME}_exposed_targets} SET(KERNEL_ROOT_DIR "${KERNEL_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 +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 @@ -149,7 +149,7 @@ CONFIGURE_PACKAGE_CONFIG_FILE(adm_local/cmake_files/${PROJECT_NAME}Config.cmake. WRITE_BASIC_PACKAGE_VERSION_FILE(${PROJECT_BINARY_DIR}/${PROJECT_NAME}ConfigVersion.cmake VERSION ${${PROJECT_NAME_UC}_VERSION} COMPATIBILITY AnyNewerVersion) - + # Install the CMake configuration files: INSTALL(FILES "${PROJECT_BINARY_DIR}/${PROJECT_NAME}Config.cmake" diff --git a/adm_local/cmake_files/SalomeRANDOMIZERConfig.cmake.in b/SalomeRANDOMIZERConfig.cmake.in similarity index 100% rename from adm_local/cmake_files/SalomeRANDOMIZERConfig.cmake.in rename to SalomeRANDOMIZERConfig.cmake.in diff --git a/adm_local/cmake_files/CMakeLists.txt b/adm_local/cmake_files/CMakeLists.txt index 06bc2a9..0bfe4d2 100755 --- a/adm_local/cmake_files/CMakeLists.txt +++ b/adm_local/cmake_files/CMakeLists.txt @@ -23,7 +23,6 @@ # These files are data, module or lib files SET(_adm_data - FindRANDOMIZER.cmake FindSalomeRANDOMIZER.cmake ) INSTALL(FILES ${_adm_data} DESTINATION ${SALOME_INSTALL_CMAKE_LOCAL}) diff --git a/adm_local/cmake_files/FindRANDOMIZER.cmake b/adm_local/cmake_files/FindRANDOMIZER.cmake deleted file mode 100644 index cf07692..0000000 --- a/adm_local/cmake_files/FindRANDOMIZER.cmake +++ /dev/null @@ -1,24 +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(RANDOMIZER_CXXFLAGS -I${RANDOMIZER_ROOT_DIR}/include/salome) # to be removed -SET(RANDOMIZER_INCLUDE_DIRS ${RANDOMIZER_ROOT_DIR}/include/salome) - -FIND_LIBRARY(RANDOMIZER_SalomeIDLRANDOMIZER SalomeIDLRANDOMIZER ${RANDOMIZER_ROOT_DIR}/lib/salome) \ No newline at end of file -- 2.39.2