From 5d0d269ae2ccb0ca80d8ff303d689f1c12468bac Mon Sep 17 00:00:00 2001 From: ana Date: Mon, 25 Jul 2016 17:05:26 +0300 Subject: [PATCH] Merge 'abn/configuration' into master branch. --- CMakeLists.txt | 15 ++++++-- adm_local/CMakeLists.txt | 1 - adm_local/cmake_files/CMakeLists.txt | 28 --------------- .../FindSalomeHEXABLOCKPLUGIN.cmake | 34 ------------------- 4 files changed, 13 insertions(+), 65 deletions(-) delete mode 100755 adm_local/cmake_files/CMakeLists.txt delete mode 100644 adm_local/cmake_files/FindSalomeHEXABLOCKPLUGIN.cmake diff --git a/CMakeLists.txt b/CMakeLists.txt index 4838891..130df2c 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -21,6 +21,9 @@ PROJECT(SalomeHEXABLOCKPLUGIN C CXX) # Ensure a proper linker behavior: CMAKE_POLICY(SET CMP0003 NEW) +IF(WIN32) + CMAKE_POLICY(SET CMP0020 OLD) # disable automatic linking to qtmain.lib +ENDIF(WIN32) # Versioning # =========== @@ -34,6 +37,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") @@ -51,8 +64,6 @@ ENDIF(EXISTS ${KERNEL_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") # User options # ============ diff --git a/adm_local/CMakeLists.txt b/adm_local/CMakeLists.txt index 907360e..4df2dc0 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 7f9f9bc..0000000 --- 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 - FindSalomeHEXABLOCKPLUGIN.cmake -) -INSTALL(FILES ${_adm_data} DESTINATION ${SALOME_INSTALL_CMAKE_LOCAL}) diff --git a/adm_local/cmake_files/FindSalomeHEXABLOCKPLUGIN.cmake b/adm_local/cmake_files/FindSalomeHEXABLOCKPLUGIN.cmake deleted file mode 100644 index 6b4c31e..0000000 --- a/adm_local/cmake_files/FindSalomeHEXABLOCKPLUGIN.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 SalomeHEXABLOCKPLUGIN_FIND_QUIETLY) - MESSAGE(STATUS "Looking for Salome HEXABLOCKPLUGIN ...") -ENDIF() - -SET(CMAKE_PREFIX_PATH "${HEXABLOCKPLUGIN_ROOT_DIR}") - -SALOME_FIND_PACKAGE(SalomeHEXABLOCKPLUGIN SalomeHEXABLOCKPLUGIN CONFIG) - -IF(NOT SalomeHEXABLOCKPLUGIN_FIND_QUIETLY) - MESSAGE(STATUS "Found Salome HEXABLOCKPLUGIN: ${HEXABLOCKPLUGIN_ROOT_DIR}") -ENDIF() - -FOREACH(_res ${SalomeHEXABLOCKPLUGIN_EXTRA_ENV}) - SALOME_ACCUMULATE_ENVIRONMENT(${_res} "${SalomeHEXABLOCKPLUGIN_EXTRA_ENV_${_res}}") -ENDFOREACH() \ No newline at end of file -- 2.39.2