From: eap Date: Tue, 7 Aug 2018 13:51:35 +0000 (+0300) Subject: FIELD -> FIELDS X-Git-Tag: SHAPER_V9_1_0RC1~3 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=refs%2Fheads%2Feap%2F23582;p=tools%2Fconfiguration.git FIELD -> FIELDS --- diff --git a/cmake/FindSalomeFIELD.cmake b/cmake/FindSalomeFIELD.cmake deleted file mode 100644 index 4e11a59..0000000 --- a/cmake/FindSalomeFIELD.cmake +++ /dev/null @@ -1,46 +0,0 @@ -# Copyright (C) 2007-2016 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, 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 -# -# Author: Adrien Bruneton -# - -# FIELD detection for Salome - this is typically called by dependent modules -# (PARAVIS, etc ...) -# -# The detection is simpler than for other prerequisites. -# See explanation in FindSalomeKERNEL.cmake. -# - -IF(NOT SalomeFIELD_FIND_QUIETLY) - MESSAGE(STATUS "Looking for Salome FIELD ...") -ENDIF() - -SET(CMAKE_PREFIX_PATH "${FIELD_ROOT_DIR}") -SALOME_FIND_PACKAGE(SalomeFIELD SalomeFIELD CONFIG) - -IF(NOT SalomeFIELD_FIND_QUIETLY) - MESSAGE(STATUS "Found Salome FIELD: ${FIELD_ROOT_DIR}") -ENDIF() - -FIND_LIBRARY(medcouplingcorba medcouplingcorba ${FIELD_ROOT_DIR}/lib/salome) -FIND_LIBRARY(medcouplingclient medcouplingclient ${FIELD_ROOT_DIR}/lib/salome) -FIND_LIBRARY(SalomeIDLMED SalomeIDLMED ${FIELD_ROOT_DIR}/lib/salome) - -FOREACH(_res ${SalomeFIELD_EXTRA_ENV}) - SALOME_ACCUMULATE_ENVIRONMENT(${_res} "${SalomeFIELD_EXTRA_ENV_${_res}}") -ENDFOREACH() \ No newline at end of file diff --git a/cmake/FindSalomeFIELDS.cmake b/cmake/FindSalomeFIELDS.cmake new file mode 100644 index 0000000..ee6f942 --- /dev/null +++ b/cmake/FindSalomeFIELDS.cmake @@ -0,0 +1,46 @@ +# Copyright (C) 2007-2016 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, 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 +# +# Author: Adrien Bruneton +# + +# FIELDS detection for Salome - this is typically called by dependent modules +# (PARAVIS, etc ...) +# +# The detection is simpler than for other prerequisites. +# See explanation in FindSalomeKERNEL.cmake. +# + +IF(NOT SalomeFIELDS_FIND_QUIETLY) + MESSAGE(STATUS "Looking for Salome FIELDS ...") +ENDIF() + +SET(CMAKE_PREFIX_PATH "${FIELDS_ROOT_DIR}") +SALOME_FIND_PACKAGE(SalomeFIELDS SalomeFIELDS CONFIG) + +IF(NOT SalomeFIELDS_FIND_QUIETLY) + MESSAGE(STATUS "Found Salome FIELDS: ${FIELDS_ROOT_DIR}") +ENDIF() + +FIND_LIBRARY(medcouplingcorba medcouplingcorba ${FIELDS_ROOT_DIR}/lib/salome) +FIND_LIBRARY(medcouplingclient medcouplingclient ${FIELDS_ROOT_DIR}/lib/salome) +FIND_LIBRARY(SalomeIDLMED SalomeIDLMED ${FIELDS_ROOT_DIR}/lib/salome) + +FOREACH(_res ${SalomeFIELDS_EXTRA_ENV}) + SALOME_ACCUMULATE_ENVIRONMENT(${_res} "${SalomeFIELDS_EXTRA_ENV_${_res}}") +ENDFOREACH() \ No newline at end of file