From 989b7e7052557735a4450a378ca1c0eb2a33dd44 Mon Sep 17 00:00:00 2001 From: rnv Date: Thu, 28 Jul 2016 14:25:24 +0300 Subject: [PATCH] Moving *all* CMake detection files to common CONFIGURATION repo. --- adm_local/cmake_files/CMakeLists.txt | 31 --------- adm_local/cmake_files/FindBLSURFPLUGIN.cmake | 24 ------- adm_local/cmake_files/FindMESHGEMS.cmake | 63 ------------------- .../cmake_files/FindSalomeBLSURFPLUGIN.cmake | 34 ---------- .../cmake_files/FindSalomeMESHGEMS.cmake | 26 -------- 5 files changed, 178 deletions(-) delete mode 100755 adm_local/cmake_files/CMakeLists.txt delete mode 100644 adm_local/cmake_files/FindBLSURFPLUGIN.cmake delete mode 100644 adm_local/cmake_files/FindMESHGEMS.cmake delete mode 100644 adm_local/cmake_files/FindSalomeBLSURFPLUGIN.cmake delete mode 100644 adm_local/cmake_files/FindSalomeMESHGEMS.cmake diff --git a/adm_local/cmake_files/CMakeLists.txt b/adm_local/cmake_files/CMakeLists.txt deleted file mode 100755 index 0aba33e..0000000 --- a/adm_local/cmake_files/CMakeLists.txt +++ /dev/null @@ -1,31 +0,0 @@ -# Copyright (C) 2013-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 - FindMESHGEMS.cmake - FindBLSURFPLUGIN.cmake - FindSalomeMESHGEMS.cmake - FindSalomeBLSURFPLUGIN.cmake -) -INSTALL(FILES ${_adm_data} DESTINATION ${SALOME_INSTALL_CMAKE_LOCAL}) diff --git a/adm_local/cmake_files/FindBLSURFPLUGIN.cmake b/adm_local/cmake_files/FindBLSURFPLUGIN.cmake deleted file mode 100644 index 5a4e383..0000000 --- a/adm_local/cmake_files/FindBLSURFPLUGIN.cmake +++ /dev/null @@ -1,24 +0,0 @@ -# Copyright (C) 2013-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 -# - -SET(BLSURFPLUGIN_CXXFLAGS -I${BLSURFPLUGIN_ROOT_DIR}/include/salome) - -FIND_LIBRARY(BLSURFEngine BLSURFEngine ${BLSURFPLUGIN_ROOT_DIR}/lib/salome) -FIND_LIBRARY(BLSURFPluginGUI BLSURFPluginGUI ${BLSURFPLUGIN_ROOT_DIR}/lib/salome) -FIND_LIBRARY(SalomeIDLBLSURFPLUGIN SalomeIDLBLSURFPLUGIN ${BLSURFPLUGIN_ROOT_DIR}/lib/salome) diff --git a/adm_local/cmake_files/FindMESHGEMS.cmake b/adm_local/cmake_files/FindMESHGEMS.cmake deleted file mode 100644 index 079f0c3..0000000 --- a/adm_local/cmake_files/FindMESHGEMS.cmake +++ /dev/null @@ -1,63 +0,0 @@ -# Copyright (C) 2013-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 -# - -# - Find MESHGEMS -# Sets the following variables: -# MESHGEMS_INCLUDE_DIRS - path to the MESHGEMS include directory -# MESHGEMS_LIBRARIES - path to the MESHGEMS libraries to be linked against - -# ------ - -MESSAGE(STATUS "Check for MESHGEMS ...") - -# ------ - -SET(MESHGEMS_ROOT_DIR $ENV{MESHGEMS_ROOT_DIR}) - -IF(MESHGEMS_ROOT_DIR) - LIST(APPEND CMAKE_PREFIX_PATH "${MESHGEMS_ROOT_DIR}") -ENDIF(MESHGEMS_ROOT_DIR) - -FIND_PATH(MESHGEMS_INCLUDE_DIRS meshgems/cadsurf.h PATH_SUFFIXES include) - -IF(MACHINE_IS_64) - SET(_suff "_64") -ELSE() - SET(_suff) -ENDIF(MACHINE_IS_64) -IF(WIN32) - SET(_plt WinXP${_suff}_VC9 WinXP${_suff}_VC10) -ELSE() - SET(_plt Linux${_suff}) -ENDIF(WIN32) - -FIND_LIBRARY(MESHGEMS_LIBRARY_mg-cadsurf NAMES mg-cadsurf PATH_SUFFIXES ${_plt}) -FIND_LIBRARY(MESHGEMS_LIBRARY_mg-precad NAMES mg-precad PATH_SUFFIXES ${_plt}) -FIND_LIBRARY(MESHGEMS_LIBRARY_meshgems NAMES meshgems PATH_SUFFIXES ${_plt}) - -# TODO: search all components -SET(MESHGEMS_LIBRARIES) -SET(MESHGEMS_LIBRARIES ${MESHGEMS_LIBRARIES} ${MESHGEMS_LIBRARY_mg-cadsurf}) -SET(MESHGEMS_LIBRARIES ${MESHGEMS_LIBRARIES} ${MESHGEMS_LIBRARY_mg-precad}) -IF(MESHGEMS_LIBRARY_meshgems) - SET(MESHGEMS_LIBRARIES ${MESHGEMS_LIBRARIES} ${MESHGEMS_LIBRARY_meshgems}) -ENDIF(MESHGEMS_LIBRARY_meshgems) - -INCLUDE(FindPackageHandleStandardArgs) -FIND_PACKAGE_HANDLE_STANDARD_ARGS(MESHGEMS REQUIRED_VARS MESHGEMS_INCLUDE_DIRS MESHGEMS_LIBRARIES) diff --git a/adm_local/cmake_files/FindSalomeBLSURFPLUGIN.cmake b/adm_local/cmake_files/FindSalomeBLSURFPLUGIN.cmake deleted file mode 100644 index d0dafc7..0000000 --- a/adm_local/cmake_files/FindSalomeBLSURFPLUGIN.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 SalomeBLSURFPLUGIN_FIND_QUIETLY) - MESSAGE(STATUS "Looking for Salome BLSURFPLUGIN ...") -ENDIF() - -SET(CMAKE_PREFIX_PATH "${BLSURFPLUGIN_ROOT_DIR}") - -SALOME_FIND_PACKAGE(SalomeBLSURFPLUGIN SalomeBLSURFPLUGIN CONFIG) - -IF(NOT SalomeBLSURFPLUGIN_FIND_QUIETLY) - MESSAGE(STATUS "Found Salome BLSURFPLUGIN: ${BLSURFPLUGIN_ROOT_DIR}") -ENDIF() - -FOREACH(_res ${SalomeBLSURFPLUGIN_EXTRA_ENV}) - SALOME_ACCUMULATE_ENVIRONMENT(${_res} "${SalomeBLSURFPLUGIN_EXTRA_ENV_${_res}}") -ENDFOREACH() diff --git a/adm_local/cmake_files/FindSalomeMESHGEMS.cmake b/adm_local/cmake_files/FindSalomeMESHGEMS.cmake deleted file mode 100644 index 1eadf6f..0000000 --- a/adm_local/cmake_files/FindSalomeMESHGEMS.cmake +++ /dev/null @@ -1,26 +0,0 @@ -# Copyright (C) 2013-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 -# - -SALOME_FIND_PACKAGE_AND_DETECT_CONFLICTS(MESHGEMS MESHGEMS_INCLUDE_DIRS 1) -MARK_AS_ADVANCED(MESHGEMS_INCLUDE_DIRS MESHGEMS_LIBRARIES) - -IF(MESHGEMS_FOUND) - SALOME_ACCUMULATE_HEADERS(MESHGEMS_INCLUDE_DIRS) - SALOME_ACCUMULATE_ENVIRONMENT(LD_LIBRARY_PATH ${MESHGEMS_LIBRARIES}) -ENDIF() -- 2.39.2