From 4aca21b3232df636c33b041d417f1ca8e678c104 Mon Sep 17 00:00:00 2001 From: vsr Date: Mon, 20 Apr 2020 10:58:57 +0300 Subject: [PATCH] Include SalomeMacros.cmake with NO_POLICY_SCOPE to apply policies --- CMakeLists.txt | 10 +---- adm_local/CMakeLists.txt | 22 --------- adm_local/cmake_files/CMakeLists.txt | 32 ------------- adm_local/cmake_files/FindGMSH.cmake | 45 ------------------- adm_local/cmake_files/FindSalomeGMSH.cmake | 28 ------------ .../cmake_files/FindSalomeGMSHPLUGIN.cmake | 36 --------------- 6 files changed, 1 insertion(+), 172 deletions(-) delete mode 100644 adm_local/CMakeLists.txt delete mode 100644 adm_local/cmake_files/CMakeLists.txt delete mode 100644 adm_local/cmake_files/FindGMSH.cmake delete mode 100644 adm_local/cmake_files/FindSalomeGMSH.cmake delete mode 100644 adm_local/cmake_files/FindSalomeGMSHPLUGIN.cmake diff --git a/CMakeLists.txt b/CMakeLists.txt index 28d030e..ff16b06 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -38,7 +38,7 @@ SET(${PROJECT_NAME_UC}_VERSION_DEV 1) 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) + INCLUDE(SalomeMacros NO_POLICY_SCOPE) ELSE() MESSAGE(FATAL_ERROR "We absolutely need the Salome CMake configuration files, please define CONFIGURATION_ROOT_DIR !") ENDIF() @@ -47,8 +47,6 @@ ENDIF() # =========== SET(KERNEL_ROOT_DIR $ENV{KERNEL_ROOT_DIR} CACHE PATH "Path to the Salome KERNEL") IF(EXISTS ${KERNEL_ROOT_DIR}) - LIST(APPEND CMAKE_MODULE_PATH "${KERNEL_ROOT_DIR}/salome_adm/cmake_files") - INCLUDE(SalomeMacros) FIND_PACKAGE(SalomeKERNEL REQUIRED) KERNEL_WITH_CORBA() # check whether KERNEL built with CORBA ELSE(EXISTS ${KERNEL_ROOT_DIR}) @@ -60,8 +58,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 # ============ @@ -100,7 +96,6 @@ ENDIF() IF(SALOME_BUILD_GUI) SET(GUI_ROOT_DIR $ENV{GUI_ROOT_DIR} CACHE PATH "Path to the Salome GUI") IF(EXISTS ${GUI_ROOT_DIR}) - LIST(APPEND CMAKE_MODULE_PATH "${GUI_ROOT_DIR}/adm_local/cmake_files") FIND_PACKAGE(SalomeGUI) SALOME_GUI_WITH_CORBA() # check whether GUI built with CORBA ADD_DEFINITIONS(${GUI_DEFINITIONS}) @@ -129,7 +124,6 @@ FIND_PACKAGE(SalomeVTK REQUIRED) SET(GEOM_ROOT_DIR $ENV{GEOM_ROOT_DIR} CACHE PATH "Path to the Salome GEOM") IF(EXISTS ${GEOM_ROOT_DIR}) - LIST(APPEND CMAKE_MODULE_PATH "${GEOM_ROOT_DIR}/adm_local/cmake_files") FIND_PACKAGE(SalomeGEOM REQUIRED) ELSE(EXISTS ${GEOM_ROOT_DIR}) MESSAGE(FATAL_ERROR "We absolutely need a Salome GEOM, please define GEOM_ROOT_DIR") @@ -140,7 +134,6 @@ ENDIF(EXISTS ${GEOM_ROOT_DIR}) SET(SMESH_ROOT_DIR $ENV{SMESH_ROOT_DIR} CACHE PATH "Path to the Salome SMESH") IF(EXISTS ${SMESH_ROOT_DIR}) - LIST(APPEND CMAKE_MODULE_PATH "${SMESH_ROOT_DIR}/adm_local/cmake_files") FIND_PACKAGE(SalomeSMESH REQUIRED) ADD_DEFINITIONS(${SMESH_DEFINITIONS}) INCLUDE_DIRECTORIES(${SMESH_INCLUDE_DIRS}) @@ -213,7 +206,6 @@ SALOME_ACCUMULATE_ENVIRONMENT(LD_LIBRARY_PATH NOCHECK ${CMAKE_INSTALL_PREFIX}/${ # Sources # ======== -ADD_SUBDIRECTORY(adm_local) ADD_SUBDIRECTORY(idl) ADD_SUBDIRECTORY(resources) ADD_SUBDIRECTORY(src) diff --git a/adm_local/CMakeLists.txt b/adm_local/CMakeLists.txt deleted file mode 100644 index 5e35a5a..0000000 --- a/adm_local/CMakeLists.txt +++ /dev/null @@ -1,22 +0,0 @@ -# Copyright (C) 2012-2015 ALNEOS -# Copyright (C) 2016-2020 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.alneos.com/ or email : contact@alneos.fr -# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com -# - -ADD_SUBDIRECTORY(cmake_files) diff --git a/adm_local/cmake_files/CMakeLists.txt b/adm_local/cmake_files/CMakeLists.txt deleted file mode 100644 index e62ba19..0000000 --- a/adm_local/cmake_files/CMakeLists.txt +++ /dev/null @@ -1,32 +0,0 @@ -# Copyright (C) 2012-2015 ALNEOS -# Copyright (C) 2016-2020 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.alneos.com/ or email : contact@alneos.fr -# 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 - FindGMSH.cmake - FindSalomeGMSH.cmake - FindSalomeGMSHPLUGIN.cmake -) -INSTALL(FILES ${_adm_data} DESTINATION ${SALOME_INSTALL_CMAKE_LOCAL}) diff --git a/adm_local/cmake_files/FindGMSH.cmake b/adm_local/cmake_files/FindGMSH.cmake deleted file mode 100644 index e2a03aa..0000000 --- a/adm_local/cmake_files/FindGMSH.cmake +++ /dev/null @@ -1,45 +0,0 @@ -# - Find GMSH -# Sets the following variables: -# GMSH_INCLUDE_DIRS - path to the GMSH include directory -# GMSH_LIBRARIES - path to the GMSH libraries to be linked against -# - -######################################################################### -# Copyright (C) 2012-2015 ALNEOS -# Copyright (C) 2016-2020 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.alneos.com/ or email : contact@alneos.fr -# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com -# - -# ------ - -MESSAGE(STATUS "Check for GMSH ...") - -# ------ - -SET(GMSH_ROOT_DIR $ENV{GMSH_ROOT_DIR} CACHE PATH "Path to the GMSH.") - -IF(GMSH_ROOT_DIR) - LIST(APPEND CMAKE_PREFIX_PATH "${GMSH_ROOT_DIR}") -ENDIF(GMSH_ROOT_DIR) - -FIND_PATH(GMSH_INCLUDE_DIRS Gmsh.h gmsh.h PATH_SUFFIXES gmsh) -FIND_LIBRARY(GMSH_LIBRARIES NAMES Gmsh gmsh) - -INCLUDE(FindPackageHandleStandardArgs) -FIND_PACKAGE_HANDLE_STANDARD_ARGS(GMSH REQUIRED_VARS GMSH_INCLUDE_DIRS GMSH_LIBRARIES) diff --git a/adm_local/cmake_files/FindSalomeGMSH.cmake b/adm_local/cmake_files/FindSalomeGMSH.cmake deleted file mode 100644 index bdba796..0000000 --- a/adm_local/cmake_files/FindSalomeGMSH.cmake +++ /dev/null @@ -1,28 +0,0 @@ -# Copyright (C) 2012-2015 ALNEOS -# Copyright (C) 2016-2020 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.alneos.com/ or email : contact@alneos.fr -# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com -# - -SALOME_FIND_PACKAGE_AND_DETECT_CONFLICTS(GMSH GMSH_INCLUDE_DIRS 2) -MARK_AS_ADVANCED(GMSH_INCLUDE_DIRS GMSH_LIBRARIES) - -IF(GMSH_FOUND) - SALOME_ACCUMULATE_HEADERS(GMSH_INCLUDE_DIRS) - SALOME_ACCUMULATE_ENVIRONMENT(LD_LIBRARY_PATH ${GMSH_LIBRARIES}) -ENDIF() \ No newline at end of file diff --git a/adm_local/cmake_files/FindSalomeGMSHPLUGIN.cmake b/adm_local/cmake_files/FindSalomeGMSHPLUGIN.cmake deleted file mode 100644 index 1836d55..0000000 --- a/adm_local/cmake_files/FindSalomeGMSHPLUGIN.cmake +++ /dev/null @@ -1,36 +0,0 @@ -# Copyright (C) 2012-2015 ALNEOS -# Copyright (C) 2016-2020 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.alneos.com/ or email : contact@alneos.fr -# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com -# - -IF(NOT SalomeGMSHPLUGIN_FIND_QUIETLY) - MESSAGE(STATUS "Looking for Salome GMSHPLUGIN ...") -ENDIF() - -SET(CMAKE_PREFIX_PATH "${GMSHPLUGIN_ROOT_DIR}") - -SALOME_FIND_PACKAGE(SalomeGMSHPLUGIN SalomeGMSHPLUGIN CONFIG) - -IF(NOT SalomeGMSHPLUGIN_FIND_QUIETLY) - MESSAGE(STATUS "Found Salome GMSHPLUGIN: ${GMSHPLUGIN_ROOT_DIR}") -ENDIF() - -FOREACH(_res ${SalomeGMSHPLUGIN_EXTRA_ENV}) - SALOME_ACCUMULATE_ENVIRONMENT(${_res} "${SalomeGMSHPLUGIN_EXTRA_ENV_${_res}}") -ENDFOREACH() -- 2.39.2