From 9488433d5ac9a431453043844e63b60e25559fc7 Mon Sep 17 00:00:00 2001 From: rnv Date: Wed, 10 Aug 2016 17:58:12 +0300 Subject: [PATCH] Merge 'abn/configuration' into master --- CMakeLists.txt | 12 +++++-- adm_local/CMakeLists.txt | 1 - adm_local/cmake_files/CMakeLists.txt | 28 ---------------- adm_local/cmake_files/FindSalomeHOMARD.cmake | 34 -------------------- 4 files changed, 10 insertions(+), 65 deletions(-) delete mode 100755 adm_local/cmake_files/CMakeLists.txt delete mode 100644 adm_local/cmake_files/FindSalomeHOMARD.cmake diff --git a/CMakeLists.txt b/CMakeLists.txt index 5bf657e5..2492947a 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -35,6 +35,16 @@ SET(${PROJECT_NAME_UC}_VERSION ${${PROJECT_NAME_UC}_MAJOR_VERSION}.${${PROJECT_NAME_UC}_MINOR_VERSION}.${${PROJECT_NAME_UC}_PATCH_VERSION}) SET(${PROJECT_NAME_UC}_VERSION_DEV 1) +# Common CMake macros +# =================== +SET(CONFIGURATION_ROOT_DIR $ENV{CONFIGURATION_ROOT_DIR} CACHE PATH "Path to the Salome CMake configuration files") +IF(EXISTS ${CONFIGURATION_ROOT_DIR}) + LIST(APPEND CMAKE_MODULE_PATH "${CONFIGURATION_ROOT_DIR}/cmake") + INCLUDE(SalomeMacros) +ELSE() + MESSAGE(FATAL_ERROR "We absolutely need the Salome CMake configuration files, please define CONFIGURATION_ROOT_DIR !") +ENDIF() + # Find KERNEL # =========== SET(KERNEL_ROOT_DIR $ENV{KERNEL_ROOT_DIR} CACHE PATH "Path to the Salome KERNEL") @@ -66,8 +76,6 @@ ENDIF(EXISTS ${GUI_ROOT_DIR}) INCLUDE(SalomeSetupPlatform) # From KERNEL # Always build libraries as shared objects: SET(BUILD_SHARED_LIBS TRUE) -# Local macros: -LIST(APPEND CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/adm_local/cmake_files") # additional preprocessor / compiler flags #ADD_DEFINITIONS(-DCMAKE_BUILD) diff --git a/adm_local/CMakeLists.txt b/adm_local/CMakeLists.txt index 907360ed..4df2dc0c 100755 --- a/adm_local/CMakeLists.txt +++ b/adm_local/CMakeLists.txt @@ -18,4 +18,3 @@ # ADD_SUBDIRECTORY(unix) -ADD_SUBDIRECTORY(cmake_files) diff --git a/adm_local/cmake_files/CMakeLists.txt b/adm_local/cmake_files/CMakeLists.txt deleted file mode 100755 index 4329483f..00000000 --- a/adm_local/cmake_files/CMakeLists.txt +++ /dev/null @@ -1,28 +0,0 @@ -# Copyright (C) 2012-2016 CEA/DEN, EDF R&D -# -# 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, or (at your option) any later version. -# -# 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 -# - -# =============================================================== -# Files to be installed -# =============================================================== - -# These files are data, module or lib files -SET(_adm_data - FindSalomeHOMARD.cmake -) -INSTALL(FILES ${_adm_data} DESTINATION ${SALOME_INSTALL_CMAKE_LOCAL}) diff --git a/adm_local/cmake_files/FindSalomeHOMARD.cmake b/adm_local/cmake_files/FindSalomeHOMARD.cmake deleted file mode 100644 index 8ff273ad..00000000 --- a/adm_local/cmake_files/FindSalomeHOMARD.cmake +++ /dev/null @@ -1,34 +0,0 @@ -# Copyright (C) 2007-2016 CEA/DEN, EDF R&D -# -# 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, or (at your option) any later version. -# -# 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 -# - -IF(NOT SalomeHOMARD_FIND_QUIETLY) - MESSAGE(STATUS "Looking for Salome HOMARD ...") -ENDIF() - -SET(CMAKE_PREFIX_PATH "${HOMARD_ROOT_DIR}") - -SALOME_FIND_PACKAGE(SalomeHOMARD SalomeHOMARD CONFIG) - -IF(NOT SalomeHOMARD_FIND_QUIETLY) - MESSAGE(STATUS "Found Salome HOMARD: ${HOMARD_ROOT_DIR}") -ENDIF() - -FOREACH(_res ${SalomeHOMARD_EXTRA_ENV}) - SALOME_ACCUMULATE_ENVIRONMENT(${_res} "${SalomeHOMARD_EXTRA_ENV_${_res}}") -ENDFOREACH() \ No newline at end of file -- 2.39.2