From: abn Date: Tue, 5 Jul 2016 08:27:45 +0000 (+0200) Subject: Moving *all* CMake detection files to common CONFIGURATION repo. X-Git-Tag: V8_1_0rc1~8^2~1 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=58db7f882983efa403819e8aa93165971b1c48b3;p=modules%2Fgui.git Moving *all* CMake detection files to common CONFIGURATION repo. --- diff --git a/CMakeLists.txt b/CMakeLists.txt index d15f636ef..cf51d49d4 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -39,12 +39,21 @@ 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") IF(EXISTS ${KERNEL_ROOT_DIR}) LIST(APPEND CMAKE_MODULE_PATH "${KERNEL_ROOT_DIR}/salome_adm/cmake_files") - INCLUDE(SalomeMacros) FIND_PACKAGE(SalomeKERNEL REQUIRED) ADD_DEFINITIONS(${KERNEL_DEFINITIONS}) INCLUDE_DIRECTORIES(${KERNEL_INCLUDE_DIRS}) @@ -54,11 +63,9 @@ ENDIF(EXISTS ${KERNEL_ROOT_DIR}) # Platform setup # ============== -INCLUDE(SalomeSetupPlatform) # From KERNEL +INCLUDE(SalomeSetupPlatform) # From CONFIGURATION # 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 4150922ef..04e783202 100755 --- a/adm_local/CMakeLists.txt +++ b/adm_local/CMakeLists.txt @@ -21,4 +21,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 074731f7c..000000000 --- a/adm_local/cmake_files/CMakeLists.txt +++ /dev/null @@ -1,46 +0,0 @@ -# Copyright (C) 2012-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 -# - -ADD_SUBDIRECTORY(deprecated) - -# =============================================================== -# Files to be installed -# =============================================================== - -# These files are data, module or lib files -SET(_adm_data - FindQwt.cmake - FindGUI.cmake - FindSIP.cmake - FindPyQt4.cmake - FindPyQt5.cmake - FindSalomePyQt4.cmake - FindSalomePyQt5.cmake - FindSalomeQt4.cmake - FindSalomeQt5.cmake - FindSalomeQwt.cmake - FindSalomeSIP.cmake - FindSalomeGUI.cmake - FindSalomeOpenGL.cmake - FindSalomeParaView.cmake - UseSIP.cmake - UsePyQt.cmake - UseQtExt.cmake -) -INSTALL(FILES ${_adm_data} DESTINATION ${SALOME_INSTALL_CMAKE_LOCAL}) diff --git a/adm_local/cmake_files/FindGUI.cmake b/adm_local/cmake_files/FindGUI.cmake deleted file mode 100644 index 55d26381c..000000000 --- a/adm_local/cmake_files/FindGUI.cmake +++ /dev/null @@ -1,66 +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 -# - -# -# TODO: this file should be removed when switching to full CMake -# - -SET(GUI_CXXFLAGS -I${GUI_ROOT_DIR}/include/salome) - -FIND_LIBRARY(caf caf ${GUI_ROOT_DIR}/lib/salome) -FIND_LIBRARY(CAM CAM ${GUI_ROOT_DIR}/lib/salome) -FIND_LIBRARY(CASCatch CASCatch ${GUI_ROOT_DIR}/lib/salome) -FIND_LIBRARY(DDS DDS ${GUI_ROOT_DIR}/lib/salome) -FIND_LIBRARY(Event Event ${GUI_ROOT_DIR}/lib/salome) -FIND_LIBRARY(GLViewer GLViewer ${GUI_ROOT_DIR}/lib/salome) -FIND_LIBRARY(LightApp LightApp ${GUI_ROOT_DIR}/lib/salome) -FIND_LIBRARY(LogWindow LogWindow ${GUI_ROOT_DIR}/lib/salome) -FIND_LIBRARY(ObjBrowser ObjBrowser ${GUI_ROOT_DIR}/lib/salome) -FIND_LIBRARY(OCCViewer OCCViewer ${GUI_ROOT_DIR}/lib/salome) -FIND_LIBRARY(OpenGLUtils OpenGLUtils ${GUI_ROOT_DIR}/lib/salome) -FIND_LIBRARY(Plot2d Plot2d ${GUI_ROOT_DIR}/lib/salome) -FIND_LIBRARY(PyConsole PyConsole ${GUI_ROOT_DIR}/lib/salome) -FIND_LIBRARY(PyInterp PyInterp ${GUI_ROOT_DIR}/lib/salome) -FIND_LIBRARY(QDS QDS ${GUI_ROOT_DIR}/lib/salome) -FIND_LIBRARY(qtx qtx ${GUI_ROOT_DIR}/lib/salome) -FIND_LIBRARY(QxScene QxScene ${GUI_ROOT_DIR}/lib/salome) -FIND_LIBRARY(SalomeApp SalomeApp ${GUI_ROOT_DIR}/lib/salome) -FIND_LIBRARY(SalomeIDLGUI SalomeIDLGUI ${GUI_ROOT_DIR}/lib/salome) -FIND_LIBRARY(SalomeObject SalomeObject ${GUI_ROOT_DIR}/lib/salome) -FIND_LIBRARY(SalomePrs SalomePrs ${GUI_ROOT_DIR}/lib/salome) -FIND_LIBRARY(SalomePyQtGUILight SalomePyQtGUILight ${GUI_ROOT_DIR}/lib/salome) -FIND_LIBRARY(SalomePyQtGUI SalomePyQtGUI ${GUI_ROOT_DIR}/lib/salome) -FIND_LIBRARY(SalomePyQt SalomePyQt ${GUI_ROOT_DIR}/lib/salome) -FIND_LIBRARY(SalomePy SalomePy ${GUI_ROOT_DIR}/lib/salome) -FIND_LIBRARY(SalomeSession SalomeSession ${GUI_ROOT_DIR}/lib/salome) -FIND_LIBRARY(SalomeStyle SalomeStyle ${GUI_ROOT_DIR}/lib/salome) -FIND_LIBRARY(SOCC SOCC ${GUI_ROOT_DIR}/lib/salome) -FIND_LIBRARY(SPlot2d SPlot2d ${GUI_ROOT_DIR}/lib/salome) -FIND_LIBRARY(std std ${GUI_ROOT_DIR}/lib/salome) -FIND_LIBRARY(SUITApp SUITApp ${GUI_ROOT_DIR}/lib/salome) -FIND_LIBRARY(suit suit ${GUI_ROOT_DIR}/lib/salome) -FIND_LIBRARY(SVTK SVTK ${GUI_ROOT_DIR}/lib/salome) -FIND_LIBRARY(ToolsGUI ToolsGUI ${GUI_ROOT_DIR}/lib/salome) -FIND_LIBRARY(ViewerTools ViewerTools ${GUI_ROOT_DIR}/lib/salome) -FIND_LIBRARY(ViewerData ViewerData ${GUI_ROOT_DIR}/lib/salome) -FIND_LIBRARY(VTKViewer VTKViewer ${GUI_ROOT_DIR}/lib/salome) -FIND_LIBRARY(vtkEDFOverloads vtkEDFOverloads ${GUI_ROOT_DIR}/lib/paraview) -FIND_LIBRARY(vtkTools vtkTools ${GUI_ROOT_DIR}/lib/salome) -FIND_LIBRARY(SalomeGuiHelpers SalomeGuiHelpers ${GUI_ROOT_DIR}/lib/salome) -FIND_LIBRARY(SalomeTreeData SalomeTreeData ${GUI_ROOT_DIR}/lib/salome) diff --git a/adm_local/cmake_files/FindPyQt4.cmake b/adm_local/cmake_files/FindPyQt4.cmake deleted file mode 100644 index e9f07955c..000000000 --- a/adm_local/cmake_files/FindPyQt4.cmake +++ /dev/null @@ -1,97 +0,0 @@ -# Copyright (C) 2013-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 -# - -# - Find PyQt4 installation -# Sets the following variables: -# PYQT_PYUIC_EXECUTABLE - path to the pyuic executable -# PYQT_PYRCC_EXECUTABLE - path to the pyrcc executable -# PYQT_PYUIC_PATH - command to launch pyuic with the correct PYTHONPATH -# PYQT_PYRCC_PATH - command to launch pyrcc with the correct PYTHONPATH -# PYQT_PYTHONPATH - path to the PyQt Python modules -# PYQT_SIPS_DIR - path to main include directory (which contains several sub folders) -# PYQT_SIPFLAGS - compilation flags extracted from PyQt -# -# The executables -# pyuic4 (pyuic4.bat) -# are searched. -# The Python command -# pyqtconfig.Configuration().pyqt_sip_flags -# is called to get the compilation flags. -# Headers are located by looking for the header file -# qobject.sip - -IF(NOT PyQt4_FIND_QUIETLY) - MESSAGE(STATUS "Looking for PyQt4 ...") -ENDIF() - -IF(NOT SIP_FOUND AND NOT PyQt4_FIND_QUIETLY) - MESSAGE(WARNING "PyQt4 needs SIP to be detected correctly!") -ENDIF() - -FIND_PROGRAM(PYQT_PYUIC_EXECUTABLE NAMES pyuic4 pyuic4.bat) -FIND_PROGRAM(PYQT_PYRCC_EXECUTABLE NAMES pyrcc4 pyrcc4.bat) - -# Get root dir locally, going up two levels from the exec: -GET_FILENAME_COMPONENT(_tmp_ROOT_DIR "${PYQT_PYUIC_EXECUTABLE}" PATH) -GET_FILENAME_COMPONENT(_tmp_ROOT_DIR "${_tmp_ROOT_DIR}" PATH) - - -# Typical locations of qobject.sip are: -# - /usr/share/sip/PyQt4/QtCore, for a system install -# - or /sip/QtCore, for a custom install -# - or /share/sip/QtCore, for a custom install -FIND_FILE(PYQT_SIP_MAIN_FILE qobject.sip PATH_SUFFIXES share/sip/QtCore sip/QtCore share/sip/PyQt4/QtCore) - -IF(PYQT_SIP_MAIN_FILE) - GET_FILENAME_COMPONENT(PYQT_SIPS_DIR "${PYQT_SIP_MAIN_FILE}" PATH) - GET_FILENAME_COMPONENT(PYQT_SIPS_DIR "${PYQT_SIPS_DIR}" PATH) -ENDIF() -MARK_AS_ADVANCED(PYQT_SIP_MAIN_FILE) - -# Get PyQt compilation flags: -SET(PYQT_PYTHONPATH ${_tmp_ROOT_DIR}/PyQt4) -SET(PYQT_SIPFLAGS) - -EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} -c "import sys; -sys.path[:0] = '${PYQT_PYTHONPATH}'.split(';'); -sys.path[:0] = '${SIP_PYTHONPATH}'.split(';'); -from PyQt4 import pyqtconfig; -sys.stdout.write(pyqtconfig.Configuration().pyqt_sip_flags)" - OUTPUT_VARIABLE PYQT_SIPFLAGS) -SEPARATE_ARGUMENTS(PYQT_SIPFLAGS) - -SET(PYQT_SIPFLAGS ${PYQT_SIPFLAGS} -I "${PYQT_SIPS_DIR}") - -INCLUDE(FindPackageHandleStandardArgs) -FIND_PACKAGE_HANDLE_STANDARD_ARGS(PyQt4 REQUIRED_VARS PYQT_PYUIC_EXECUTABLE PYQT_PYRCC_EXECUTABLE PYQT_SIPS_DIR PYQT_SIPFLAGS ) - -# Wrap the final executables so that they always use the proper environment (PYTHONPATH): -# The results are put to variables: -# PYQT_PYUIC_PATH - command to launch pyuic with the correct PYTHONPATH -# PYQT_PYRCC_PATH - command to launch pyrcc with the correct PYTHONPATH -# TODO: should be done like Sphinx in KERNEL (i.e. generating a shell script)? - -IF(WIN32 AND NOT CYGWIN) - SET(PYQT_PYUIC_PATH set PYTHONPATH=${PYQT_PYTHONPATH};${SIP_PYTHONPATH};%PYTHONPATH% && ${PYQT_PYUIC_EXECUTABLE}) - SET(PYQT_PYRCC_PATH set PYTHONPATH=${PYQT_PYTHONPATH};${SIP_PYTHONPATH};%PYTHONPATH% && ${PYQT_PYRCC_EXECUTABLE}) -ELSE() - STRING(REPLACE ";" ":" PYQT_PYTHONPATH "${PYQT_PYTHONPATH}") - SET(PYQT_PYUIC_PATH /usr/bin/env PYTHONPATH="${PYQT_PYTHONPATH}:${SIP_PYTHONPATH}:$$PYTHONPATH" ${PYQT_PYUIC_EXECUTABLE}) - SET(PYQT_PYRCC_PATH /usr/bin/env PYTHONPATH="${PYQT_PYTHONPATH}:${SIP_PYTHONPATH}:$$PYTHONPATH" ${PYQT_PYRCC_EXECUTABLE}) -ENDIF() diff --git a/adm_local/cmake_files/FindPyQt5.cmake b/adm_local/cmake_files/FindPyQt5.cmake deleted file mode 100644 index b72c418d9..000000000 --- a/adm_local/cmake_files/FindPyQt5.cmake +++ /dev/null @@ -1,97 +0,0 @@ -# Copyright (C) 2013-2015 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 -# - -# - Find PyQt5 installation -# Sets the following variables: -# PYQT_PYUIC_EXECUTABLE - path to the pyuic executable -# PYQT_PYRCC_EXECUTABLE - path to the pyrcc executable -# PYQT_PYUIC_PATH - command to launch pyuic with the correct PYTHONPATH -# PYQT_PYRCC_PATH - command to launch pyrcc with the correct PYTHONPATH -# PYQT_PYTHONPATH - path to the PyQt Python modules -# PYQT_SIPS_DIR - path to main include directory (which contains several sub folders) -# PYQT_SIPFLAGS - compilation flags extracted from PyQt -# -# The executables -# pyuic5 (pyuic5.bat) -# are searched. -# The Python command -# pyqtconfig.Configuration().pyqt_sip_flags -# is called to get the compilation flags. -# Headers are located by looking for the header file -# qobject.sip - -IF(NOT PyQt5_FIND_QUIETLY) - MESSAGE(STATUS "Looking for PyQt5 ...") -ENDIF() - -IF(NOT SIP_FOUND AND NOT PyQt5_FIND_QUIETLY) - MESSAGE(WARNING "PyQt5 needs SIP to be detected correctly!") -ENDIF() - -FIND_PROGRAM(PYQT_PYUIC_EXECUTABLE NAMES pyuic5 pyuic5.bat) -FIND_PROGRAM(PYQT_PYRCC_EXECUTABLE NAMES pyrcc5 pyrcc5.bat) - -# Get root dir locally, going up two levels from the exec: -GET_FILENAME_COMPONENT(_tmp_ROOT_DIR "${PYQT_PYUIC_EXECUTABLE}" PATH) -GET_FILENAME_COMPONENT(_tmp_ROOT_DIR "${_tmp_ROOT_DIR}" PATH) - - -# Typical locations of qobject.sip are: -# - /usr/share/sip/PyQt5/QtCore, for a system install -# - or /sip/QtCore, for a custom install -# - or /share/sip/QtCore, for a custom install -FIND_FILE(PYQT_SIP_MAIN_FILE qobject.sip PATH_SUFFIXES share/sip/QtCore sip/QtCore share/sip/PyQt5/QtCore) - -IF(PYQT_SIP_MAIN_FILE) - GET_FILENAME_COMPONENT(PYQT_SIPS_DIR "${PYQT_SIP_MAIN_FILE}" PATH) - GET_FILENAME_COMPONENT(PYQT_SIPS_DIR "${PYQT_SIPS_DIR}" PATH) -ENDIF() -MARK_AS_ADVANCED(PYQT_SIP_MAIN_FILE) - -# Get PyQt compilation flags: -SET(PYQT_PYTHONPATH ${_tmp_ROOT_DIR}/PyQt5) -SET(PYQT_SIPFLAGS) - -EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} -c "import sys; -sys.path[:0] = '${PYQT_PYTHONPATH}'.split(';'); -sys.path[:0] = '${SIP_PYTHONPATH}'.split(';'); -from PyQt5.QtCore import PYQT_CONFIGURATION; -sys.stdout.write(PYQT_CONFIGURATION['sip_flags'])" - OUTPUT_VARIABLE PYQT_SIPFLAGS) -SEPARATE_ARGUMENTS(PYQT_SIPFLAGS) - -SET(PYQT_SIPFLAGS ${PYQT_SIPFLAGS} -I "${PYQT_SIPS_DIR}") - -INCLUDE(FindPackageHandleStandardArgs) -FIND_PACKAGE_HANDLE_STANDARD_ARGS(PyQt5 REQUIRED_VARS PYQT_PYUIC_EXECUTABLE PYQT_PYRCC_EXECUTABLE PYQT_SIPS_DIR PYQT_SIPFLAGS ) - -# Wrap the final executables so that they always use the proper environment (PYTHONPATH): -# The results are put to variables: -# PYQT_PYUIC_PATH - command to launch pyuic with the correct PYTHONPATH -# PYQT_PYRCC_PATH - command to launch pyrcc with the correct PYTHONPATH -# TODO: should be done like Sphinx in KERNEL (i.e. generating a shell script)? - -IF(WIN32 AND NOT CYGWIN) - SET(PYQT_PYUIC_PATH set PYTHONPATH=${PYQT_PYTHONPATH};${SIP_PYTHONPATH};%PYTHONPATH% && ${PYQT_PYUIC_EXECUTABLE}) - SET(PYQT_PYRCC_PATH set PYTHONPATH=${PYQT_PYTHONPATH};${SIP_PYTHONPATH};%PYTHONPATH% && ${PYQT_PYRCC_EXECUTABLE}) -ELSE() - STRING(REPLACE ";" ":" PYQT_PYTHONPATH "${PYQT_PYTHONPATH}") - SET(PYQT_PYUIC_PATH /usr/bin/env PYTHONPATH="${PYQT_PYTHONPATH}:${SIP_PYTHONPATH}:$$PYTHONPATH" ${PYQT_PYUIC_EXECUTABLE}) - SET(PYQT_PYRCC_PATH /usr/bin/env PYTHONPATH="${PYQT_PYTHONPATH}:${SIP_PYTHONPATH}:$$PYTHONPATH" ${PYQT_PYRCC_EXECUTABLE}) -ENDIF() diff --git a/adm_local/cmake_files/FindQwt.cmake b/adm_local/cmake_files/FindQwt.cmake deleted file mode 100644 index e4993611b..000000000 --- a/adm_local/cmake_files/FindQwt.cmake +++ /dev/null @@ -1,64 +0,0 @@ -# Copyright (C) 2013-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 -# - -# - Find Qwt installation -# Sets the following variables: -# QWT_LIBRARY - path to the Qwt library -# QWT_INCLUDE_DIR - path to the Qwt headers -# -# The header qwt_plot.h is looked for. -# The libraries -# qwt-qt4, qwt -# are looked for. -# - -IF(NOT Qwt_FIND_QUIETLY) - MESSAGE(STATUS "Looking for Qwt ...") -ENDIF() - -FIND_PATH(QWT_INCLUDE_DIR qwt_plot.h PATH_SUFFIXES qwt) -FIND_PATH(QWT_INCLUDE_DIR qwt_plot.h PATH_SUFFIXES qwt-qt4) - -IF(WIN32) - SET(QWT_DEFINITIONS "-DQWT_DLL") - - IF(CMAKE_BUILD_TYPE STREQUAL Debug) - FIND_LIBRARY(QWT_LIBRARY qwtd) - ENDIF() - FIND_LIBRARY(QWT_LIBRARY qwt) -ELSE(WIN32) - # Give precedence to qwt-qt4 library. - # Note: on some platforms there can be several native qwt libraries linked against different - # versions of Qt; for example /usr/lib/libqwt.so for qwt linked against Qt 3 and - # /usr/lib/libqwt-qt4.so for qwt linked against Qt 4. - # We need only qt4-based qwt library, so we search libqwt-qt4, then libqwt library - # first ignoring system paths, then including system paths. - FIND_LIBRARY(QWT_LIBRARY qwt-qt4 PATH_SUFFIXES lib lib64 PATHS "${QWT_ROOT_DIR}" NO_DEFAULT_PATH) - FIND_LIBRARY(QWT_LIBRARY qwt-qt4 PATHS "${QWT_ROOT_DIR}" NO_DEFAULT_PATH) - FIND_LIBRARY(QWT_LIBRARY qwt PATH_SUFFIXES lib lib64 PATHS "${QWT_ROOT_DIR}" NO_DEFAULT_PATH) - FIND_LIBRARY(QWT_LIBRARY qwt PATHS "${QWT_ROOT_DIR}" NO_DEFAULT_PATH) - FIND_LIBRARY(QWT_LIBRARY qwt-qt4 PATH_SUFFIXES lib lib64) - FIND_LIBRARY(QWT_LIBRARY qwt-qt4) - FIND_LIBRARY(QWT_LIBRARY qwt PATH_SUFFIXES lib lib64) - FIND_LIBRARY(QWT_LIBRARY qwt) -ENDIF(WIN32) - -INCLUDE(FindPackageHandleStandardArgs) -FIND_PACKAGE_HANDLE_STANDARD_ARGS(Qwt REQUIRED_VARS QWT_INCLUDE_DIR QWT_LIBRARY) - diff --git a/adm_local/cmake_files/FindSIP.cmake b/adm_local/cmake_files/FindSIP.cmake deleted file mode 100644 index 601cd4537..000000000 --- a/adm_local/cmake_files/FindSIP.cmake +++ /dev/null @@ -1,46 +0,0 @@ -# Copyright (C) 2013-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 -# - -# - Find SIP -# Sets the following variables: -# SIP_EXECUTABLE - path to the SIP executable -# SIP_INCLUDE_DIR - path to the SIP headers -# SIP_PYTHONPATH - path to the SIP Python packages -# -# The header sip.h is looked for. -# The binary 'sip' is looked for. -# - -IF(NOT SIP_FIND_QUIETLY) - MESSAGE(STATUS "Looking for SIP ...") -ENDIF() - -FIND_PROGRAM(SIP_EXECUTABLE sip) -FIND_PATH(SIP_INCLUDE_DIR sip.h PATH_SUFFIXES python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}) - -IF(SIP_INCLUDE_DIR) - GET_FILENAME_COMPONENT(SIP_PYTHONPATH "${SIP_INCLUDE_DIR}" PATH) - GET_FILENAME_COMPONENT(SIP_PYTHONPATH "${SIP_PYTHONPATH}" PATH) - SET(SIP_PYTHONPATH "${SIP_PYTHONPATH}/lib/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/site-packages") -ENDIF() - -INCLUDE(FindPackageHandleStandardArgs) -FIND_PACKAGE_HANDLE_STANDARD_ARGS(SIP REQUIRED_VARS SIP_INCLUDE_DIR SIP_EXECUTABLE SIP_PYTHONPATH) - - diff --git a/adm_local/cmake_files/FindSalomeGUI.cmake b/adm_local/cmake_files/FindSalomeGUI.cmake deleted file mode 100644 index 66d5b9f54..000000000 --- a/adm_local/cmake_files/FindSalomeGUI.cmake +++ /dev/null @@ -1,109 +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 -# - -# GUI 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 SalomeGUI_FIND_QUIETLY) - MESSAGE(STATUS "Looking for Salome GUI ...") -ENDIF() - -SET(CMAKE_PREFIX_PATH "${GUI_ROOT_DIR}") -SALOME_FIND_PACKAGE(SalomeGUI SalomeGUI CONFIG) - -IF(NOT SalomeGUI_FIND_QUIETLY) - MESSAGE(STATUS "Found Salome GUI: ${GUI_ROOT_DIR}") -ENDIF() - -FOREACH(_res ${SalomeGUI_EXTRA_ENV}) - SALOME_ACCUMULATE_ENVIRONMENT(${_res} "${SalomeGUI_EXTRA_ENV_${_res}}") -ENDFOREACH() - -#---------------------------------------------------------------------------- -# SALOME_GUI_WITH_CORBA is a macro useful for determining whether a SALOME GUI module -# is built in not light mode (with CORBA) -#---------------------------------------------------------------------------- -MACRO(SALOME_GUI_WITH_CORBA) - IF(SALOME_GUI_LIGHT_ONLY) - MESSAGE(FATAL_ERROR "\nWe absolutely need a Salome GUI module with CORBA.\nPlease set option SALOME_LIGHT_ONLY to OFF when building GUI module.") - ENDIF() -ENDMACRO(SALOME_GUI_WITH_CORBA) - - -#---------------------------------------------------------------------------- -# SALOME_GUI_MODE is a macro useful for determining whether a GUI module -# builded in particular mode -#---------------------------------------------------------------------------- -######################################################################### -# SALOME_GUI_MODE() -# -# USAGE: SALOME_GUI_MODE(_options) -# -# ARGUMENTS: -# _options [input] List - The list of CMake options given to SALOME GUI -# -# Notes: -# - The arguments list can include "OPTIONAL" keywords: -# * All arguments preceded by "OPTIONAL" keyword are mandatory for current module. -# If GUI module was compiled without this functionality, further installation -# of the current module becomes impossible. -# * All arguments following "OPTIONAL" keyword are optional for current module, which -# uses this functionality, but can be installed without it. -# -# - At present there are next options in the GUI module: -# SALOME_USE_OCCVIEWER, SALOME_USE_VTKVIEWER, SALOME_USE_GLVIEWER, SALOME_USE_PLOT2DVIEWER, -# SALOME_USE_GRAPHICSVIEW, SALOME_USE_QXGRAPHVIEWER, SALOME_USE_PVVIEWER, SALOME_USE_PYVIEWER, -# SALOME_USE_PYCONSOLE, SALOME_USE_SALOMEOBJECT -# -# Example of usage: -# SALOME_GUI_MODE(SALOME_USE_OCCVIEWER SALOME_USE_SALOMEOBJECT OPTIONAL SALOME_USE_PYCONSOLE) -# -MACRO(SALOME_GUI_MODE) - MESSAGE(STATUS "") - MESSAGE(STATUS " Checking status of GUI options") - MESSAGE(STATUS " ==================================== ") - MESSAGE(STATUS "") - SET(_message) - SET(_length 25) - SET(_is_optional OFF) - FOREACH(_option ${ARGN}) - IF(${_option} STREQUAL "OPTIONAL") - SET(_is_optional ON) - MESSAGE(STATUS " Optional:") - ELSE() - SALOME_JUSTIFY_STRING(${_option} ${_length} _option_name) - MESSAGE(STATUS " * ${_option_name} -> ${${_option}}") - IF(NOT ${_option} AND NOT ${_is_optional}) - LIST(APPEND _message ${_option}) - ENDIF() - ENDIF() - ENDFOREACH() - MESSAGE(STATUS "") - - IF(_message) - SET(_message "We absolutely need a Salome GUI module in special mode. The following options should be set to ON when building GUI module: \n${_message}\n") - MESSAGE(FATAL_ERROR "${_message}") - ENDIF() -ENDMACRO(SALOME_GUI_MODE) diff --git a/adm_local/cmake_files/FindSalomeOpenGL.cmake b/adm_local/cmake_files/FindSalomeOpenGL.cmake deleted file mode 100644 index 1cf4d2eb1..000000000 --- a/adm_local/cmake_files/FindSalomeOpenGL.cmake +++ /dev/null @@ -1,38 +0,0 @@ -# Copyright (C) 2013-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 -# - -# OpenGL detection for Salome -# -# !! Please read the generic detection procedure in SalomeMacros.cmake !! -# -IF(WIN32) - # The variable is not even set under Windows 32. Force it to blank so that - # we don't get a warning in the big macro. - SET(OPENGL_INCLUDE_DIR "") -ENDIF() -SALOME_FIND_PACKAGE_AND_DETECT_CONFLICTS(OpenGL OPENGL_INCLUDE_DIR 1) -#MARK_AS_ADVANCED() - -IF(OPENGL_FOUND) - SALOME_ACCUMULATE_HEADERS(OPENGL_INCLUDE_DIR) - SALOME_ACCUMULATE_ENVIRONMENT(LD_LIBRARY_PATH ${OPENGL_LIBRARIES}) -ENDIF() - diff --git a/adm_local/cmake_files/FindSalomeParaView.cmake b/adm_local/cmake_files/FindSalomeParaView.cmake deleted file mode 100644 index db4043783..000000000 --- a/adm_local/cmake_files/FindSalomeParaView.cmake +++ /dev/null @@ -1,39 +0,0 @@ -# Copyright (C) 2010-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 -# - -# ParaView detection for salome -# -# !! Please read the generic detection procedure in SalomeMacros.cmake !! -# - -IF(NOT QT_VERSION) - MESSAGE(FATAL_ERROR "Detection of ParaView requires Qt to be detected first!") -ENDIF() - -IF (QT_VERSION VERSION_LESS "5.0") - SET(PARAVIEW_QT_VERSION "4") -ELSE() - SET(PARAVIEW_QT_VERSION "5") -ENDIF() - -SALOME_FIND_PACKAGE_AND_DETECT_CONFLICTS(ParaView PARAVIEW_USE_FILE 4) - -INCLUDE(${PARAVIEW_USE_FILE}) diff --git a/adm_local/cmake_files/FindSalomePyQt4.cmake b/adm_local/cmake_files/FindSalomePyQt4.cmake deleted file mode 100644 index eb6679699..000000000 --- a/adm_local/cmake_files/FindSalomePyQt4.cmake +++ /dev/null @@ -1,37 +0,0 @@ -# Copyright (C) 2013-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 -# - -# PyQt4 detection for Salome -# -# !! Please read the generic detection procedure in SalomeMacros.cmake !! -# - -# PyQt needs SIP, call it automatically -FIND_PACKAGE(SalomeSIP REQUIRED) - -SALOME_FIND_PACKAGE_AND_DETECT_CONFLICTS(PyQt4 PYQT_PYUIC_EXECUTABLE 2) -MARK_AS_ADVANCED(PYQT_PYUIC_EXECUTABLE PYQT_PYRCC_EXECUTABLE PYQT_SIPS_DIR PYQT_PYUIC_PATH PYQT_PYRCC_PATH) - -IF(PYQT4_FOUND) - SALOME_ACCUMULATE_ENVIRONMENT(PATH ${PYQT_PYUIC_EXECUTABLE}) - SALOME_ACCUMULATE_ENVIRONMENT(LD_LIBRARY_PATH ${PYQT_PYTHONPATH}) - SALOME_ACCUMULATE_ENVIRONMENT(PYTHONPATH ${PYQT_PYTHONPATH}) -ENDIF() diff --git a/adm_local/cmake_files/FindSalomePyQt5.cmake b/adm_local/cmake_files/FindSalomePyQt5.cmake deleted file mode 100644 index 22598cc26..000000000 --- a/adm_local/cmake_files/FindSalomePyQt5.cmake +++ /dev/null @@ -1,37 +0,0 @@ -# Copyright (C) 2013-2015 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 -# - -# PyQt5 detection for Salome -# -# !! Please read the generic detection procedure in SalomeMacros.cmake !! -# - -# PyQt needs SIP, call it automatically -FIND_PACKAGE(SalomeSIP REQUIRED) - -SALOME_FIND_PACKAGE_AND_DETECT_CONFLICTS(PyQt5 PYQT_PYUIC_EXECUTABLE 2) -MARK_AS_ADVANCED(PYQT_PYUIC_EXECUTABLE PYQT_PYRCC_EXECUTABLE PYQT_SIPS_DIR PYQT_PYUIC_PATH PYQT_PYRCC_PATH) - -IF(PYQT5_FOUND) - SALOME_ACCUMULATE_ENVIRONMENT(PATH ${PYQT_PYUIC_EXECUTABLE}) - SALOME_ACCUMULATE_ENVIRONMENT(LD_LIBRARY_PATH ${PYQT_PYTHONPATH}) - SALOME_ACCUMULATE_ENVIRONMENT(PYTHONPATH ${PYQT_PYTHONPATH}) -ENDIF() diff --git a/adm_local/cmake_files/FindSalomeQt4.cmake b/adm_local/cmake_files/FindSalomeQt4.cmake deleted file mode 100644 index b4fb9bf35..000000000 --- a/adm_local/cmake_files/FindSalomeQt4.cmake +++ /dev/null @@ -1,44 +0,0 @@ -# Copyright (C) 2013-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 -# - -# Qt4 detection for Salome -# -# !! Please read the generic detection procedure in SalomeMacros.cmake !! -# - -SALOME_FIND_PACKAGE_AND_DETECT_CONFLICTS(Qt4 QT_INCLUDES 2) -MARK_AS_ADVANCED(QT_QMAKE_EXECUTABLE) - -# This is only needed to correctly detect Qt help generator tool, to workaround an error -# coming from ParaView detection procedure -FIND_PROGRAM(QT_HELP_GENERATOR qhelpgenerator - PATHS "${QT_BINARY_DIR}" NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH - DOC "qhelpgenerator used to compile Qt help project files" - ) -MARK_AS_ADVANCED(QT_HELP_GENERATOR) - -IF(QT4_FOUND) - SALOME_ACCUMULATE_HEADERS(QT_INCLUDES) - SALOME_ACCUMULATE_ENVIRONMENT(PATH ${QT_QMAKE_EXECUTABLE}) - SALOME_ACCUMULATE_ENVIRONMENT(LD_LIBRARY_PATH ${QT_QTCORE_LIBRARY}) - SET(QT_VERSION "${QT_VERSION_MAJOR}.${QT_VERSION_MINOR}.${QT_VERSION_PATCH}") - MESSAGE(STATUS "Qt version is ${QT_VERSION}") -ENDIF() diff --git a/adm_local/cmake_files/FindSalomeQt5.cmake b/adm_local/cmake_files/FindSalomeQt5.cmake deleted file mode 100644 index 8e723d0f4..000000000 --- a/adm_local/cmake_files/FindSalomeQt5.cmake +++ /dev/null @@ -1,91 +0,0 @@ -# Copyright (C) 2013-2015 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 -# - -# Qt5 detection for Salome -# -# !! Please read the generic detection procedure in SalomeMacros.cmake !! -# - -# Qt5_FIND_COMPONENTS variable is set here to prevent ParaView to reset list of Qt5 modules, -# just to avoid extra dependencies - -SET(QT_INCLUDES) -SET(QT_DEFINITIONS) -SET(QT_LIBRARIES) -# Find Qt5Core to get Qt version -SET(Qt5_FIND_COMPONENTS QtCore) -SALOME_FIND_PACKAGE_AND_DETECT_CONFLICTS(Qt5Core Qt5Core_INCLUDE_DIRS 1 ENVVAR QT5_ROOT_DIR) -IF(Qt5Core_FOUND) - LIST(APPEND QT_INCLUDES ${Qt5Core_INCLUDE_DIRS}) - LIST(APPEND QT_DEFINITIONS ${Qt5Core_DEFINITIONS}) - LIST(APPEND QT_LIBRARIES ${Qt5Core_LIBRARIES}) - SET(QT_VERSION "${Qt5Core_VERSION}") -ENDIF() - -SET(Qt5_FIND_COMPONENTS Gui Widgets Network Xml OpenGL PrintSupport Help Test Sql Sensors Positioning Quick Qml Multimedia MultimediaWidgets WebChannel UiTools) - -IF ("${QT_VERSION}" VERSION_LESS "5.6.0") - LIST(APPEND Qt5_FIND_COMPONENTS WebKit WebKitWidgets) -ELSE() - LIST(APPEND Qt5_OPTIONAL_COMPONENTS WebEngine WebEngineWidgets) -ENDIF() - -IF(NOT WIN32) - LIST(APPEND Qt5_FIND_COMPONENTS X11Extras) -ENDIF() - -FOREACH(_Qt5_COMPONENT_ ${Qt5_FIND_COMPONENTS} ${Qt5_OPTIONAL_COMPONENTS}) - SET(_Qt5_COMPONENT Qt5${_Qt5_COMPONENT_}) - LIST(FIND Qt5_OPTIONAL_COMPONENTS ${_Qt5_COMPONENT_} idx) - IF(${idx} GREATER -1) - SET(Salome${_Qt5_COMPONENT}_FIND_QUIETLY TRUE) - ENDIF() - SALOME_FIND_PACKAGE_AND_DETECT_CONFLICTS(${_Qt5_COMPONENT} ${_Qt5_COMPONENT}_INCLUDE_DIRS 1 ENVVAR QT5_ROOT_DIR) - LIST(APPEND QT_INCLUDES ${${_Qt5_COMPONENT}_INCLUDE_DIRS}) - LIST(APPEND QT_DEFINITIONS ${${_Qt5_COMPONENT}_DEFINITIONS}) - LIST(APPEND QT_LIBRARIES ${${_Qt5_COMPONENT}_LIBRARIES}) -ENDFOREACH() - -FIND_PACKAGE(Qt5LinguistTools) -GET_TARGET_PROPERTY(QT_LRELEASE_EXECUTABLE Qt5::lrelease LOCATION) -MARK_AS_ADVANCED(QT_LRELEASE_EXECUTABLE) - -GET_FILENAME_COMPONENT(QT_BINARY_DIR ${QT_LRELEASE_EXECUTABLE} DIRECTORY) -MARK_AS_ADVANCED(QT_BINARY_DIR) - -# This is only needed to correctly detect Qt help generator tool, to workaround an error -# coming from ParaView detection procedure -FIND_PROGRAM(QT_HELP_GENERATOR - qhelpgenerator - PATHS "${QT_BINARY_DIR}" - NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH - DOC "qhelpgenerator used to compile Qt help project files") -MARK_AS_ADVANCED(QT_HELP_GENERATOR) - -IF(Qt5Core_FOUND) - SALOME_ACCUMULATE_HEADERS(QT_INCLUDES) - SALOME_ACCUMULATE_ENVIRONMENT(PATH ${LINGUIST_PATH}) - SALOME_ACCUMULATE_ENVIRONMENT(LD_LIBRARY_PATH ${Qt5Core_LIBRARIES}) - GET_FILENAME_COMPONENT(Qt5_DIR ${Qt5Core_DIR} PATH) - FILE(TO_NATIVE_PATH "${Qt5_DIR}/Qt5" Qt5_DIR) - SET(SalomeQt5_COMPONENTS ${Qt5_FIND_COMPONENTS}) - MESSAGE(STATUS "Qt version is ${QT_VERSION}") -ENDIF() diff --git a/adm_local/cmake_files/FindSalomeQwt.cmake b/adm_local/cmake_files/FindSalomeQwt.cmake deleted file mode 100644 index cec84e63a..000000000 --- a/adm_local/cmake_files/FindSalomeQwt.cmake +++ /dev/null @@ -1,32 +0,0 @@ -# Copyright (C) 2013-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 -# - -# Qwt detection for Salome -# -# !! Please read the generic detection procedure in SalomeMacros.cmake !! -# -SALOME_FIND_PACKAGE_AND_DETECT_CONFLICTS(Qwt QWT_INCLUDE_DIR 1) -MARK_AS_ADVANCED(QWT_INCLUDE_DIR QWT_LIBRARY) - -IF(QWT_FOUND) - SALOME_ACCUMULATE_HEADERS(QWT_INCLUDE_DIR) - SALOME_ACCUMULATE_ENVIRONMENT(LD_LIBRARY_PATH ${QWT_LIBRARY}) -ENDIF() \ No newline at end of file diff --git a/adm_local/cmake_files/FindSalomeSIP.cmake b/adm_local/cmake_files/FindSalomeSIP.cmake deleted file mode 100644 index 788e2e586..000000000 --- a/adm_local/cmake_files/FindSalomeSIP.cmake +++ /dev/null @@ -1,34 +0,0 @@ -# Copyright (C) 2013-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 -# - -# SIP detection for Salome -# -# !! Please read the generic detection procedure in SalomeMacros.cmake !! -# -SALOME_FIND_PACKAGE_AND_DETECT_CONFLICTS(SIP SIP_EXECUTABLE 2) -MARK_AS_ADVANCED(SIP_EXECUTABLE SIP_INCLUDE_DIR) - -IF(SIP_FOUND) - SALOME_ACCUMULATE_ENVIRONMENT(PATH ${SIP_EXECUTABLE}) - SALOME_ACCUMULATE_ENVIRONMENT(LD_LIBRARY_PATH ${SIP_PYTHONPATH}) - SALOME_ACCUMULATE_ENVIRONMENT(PYTHONPATH ${SIP_PYTHONPATH}) -ENDIF() - diff --git a/adm_local/cmake_files/UsePyQt.cmake b/adm_local/cmake_files/UsePyQt.cmake deleted file mode 100644 index 587aef25a..000000000 --- a/adm_local/cmake_files/UsePyQt.cmake +++ /dev/null @@ -1,162 +0,0 @@ -# Copyright (C) 2012-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: Vadim SANDLER, Open CASCADE S.A.S. (vadim.sandler@opencascade.com) - -INCLUDE(UseSIP) - -#################################################################### -# -# _PYQT_WRAP_GET_UNIQUE_TARGET_NAME: internal function -# -# Used to generate unique custom target name for usage in -# PYQT_WRAP_UIC macro. -# -# USAGE: _PYQT_WRAP_GET_UNIQUE_TARGET_NAME(prefix unique_name) -# -# ARGUMENTS: -# prefix [in] prefix for the name -# unique_name [out] unique name generated by function -# -#################################################################### -FUNCTION(_PYQT_WRAP_GET_UNIQUE_TARGET_NAME name unique_name) - SET(_propertyName "_PYQT_WRAP_UNIQUE_COUNTER_${name}") - GET_PROPERTY(_currentCounter GLOBAL PROPERTY "${_propertyName}") - IF(NOT _currentCounter) - SET(_currentCounter 1) - ENDIF() - SET(${unique_name} "${name}_${_currentCounter}" PARENT_SCOPE) - MATH(EXPR _currentCounter "${_currentCounter} + 1") - SET_PROPERTY(GLOBAL PROPERTY ${_propertyName} ${_currentCounter} ) -ENDFUNCTION() - -#################################################################### -# -# PYQT_WRAP_UIC macro -# -# Create Python modules by processing input *.ui (Qt designer) files with -# PyQt pyuic tool. -# -# USAGE: PYQT_WRAP_UIC(output_files pyuic_files) -# -# ARGUMENTS: -# output_files [out] variable where output file names are listed to -# pyuic_files [in] list of *.ui files -# -# NOTES: -# - Input files are considered relative to the current source directory. -# - Output files are generated in the current build directory. -# - Macro automatically adds custom build target to generate output files -# -#################################################################### -MACRO(PYQT_WRAP_UIC outfiles) - - IF(NOT WIN32) - - FOREACH(_input ${ARGN}) - GET_FILENAME_COMPONENT(_input_name ${_input} NAME) - STRING(REPLACE ".ui" "_ui.py" _input_name ${_input_name}) - SET(_output ${CMAKE_CURRENT_BINARY_DIR}/${_input_name}) - ADD_CUSTOM_COMMAND( - OUTPUT ${_output} - COMMAND ${PYQT_PYUIC_PATH} -o ${_output} ${CMAKE_CURRENT_SOURCE_DIR}/${_input} - MAIN_DEPENDENCY ${_input} - ) - SET(${outfiles} ${${outfiles}} ${_output}) - ENDFOREACH() - _PYQT_WRAP_GET_UNIQUE_TARGET_NAME(BUILD_UI_PY_FILES _uniqueTargetName) - ADD_CUSTOM_TARGET(${_uniqueTargetName} ALL DEPENDS ${${outfiles}}) - - ELSE(NOT WIN32) - -#### -# ANA: Workaround for the Microsoft Visual Studio 2010. Seems there is a bug in -# the Microsoft Visual Studio 2010 or CMake 2.8.10.2: custom target doesn't work -# for the list of the dependencies. It works only for the first dependency in the -# list. So generate separate target for the each input file. This problem will be -#investigated in the future. -#### - - SET_PROPERTY(GLOBAL PROPERTY USE_FOLDERS ON) - _PYQT_WRAP_GET_UNIQUE_TARGET_NAME(BUILD_UI_PY_FILES _uniqueTargetName) - ADD_CUSTOM_TARGET(${_uniqueTargetName} ALL) - SET_TARGET_PROPERTIES(${_uniqueTargetName} PROPERTIES FOLDER PYQT_WRAP_UIC_TARGETS) - FOREACH(_input ${ARGN}) - GET_FILENAME_COMPONENT(_input_name ${_input} NAME) - STRING(REPLACE ".ui" "_ui.py" _input_name ${_input_name}) - SET(_output ${CMAKE_CURRENT_BINARY_DIR}/${_input_name}) - _PYQT_WRAP_GET_UNIQUE_TARGET_NAME(BUILD_UI_PY_FILES _TgName) - ADD_CUSTOM_TARGET(${_TgName} ${PYQT_PYUIC_PATH} -o ${_output} ${CMAKE_CURRENT_SOURCE_DIR}/${_input} - DEPENDS ${_input} - ) - SET_TARGET_PROPERTIES(${_TgName} PROPERTIES FOLDER PYQT_WRAP_UIC_TARGETS) - ADD_DEPENDENCIES(${_uniqueTargetName} ${_TgName}) - SET(${outfiles} ${${outfiles}} ${_output}) - ENDFOREACH() - ENDIF(NOT WIN32) -ENDMACRO(PYQT_WRAP_UIC) - -#################################################################### -# -# PYQT_WRAP_SIP macro -# -# Generate C++ wrappings for *.sip files by processing them with sip. -# -# USAGE: PYQT_WRAP_SIP(output_files sip_file [sip_file...] [OPTIONS options] [SOURCES sources]) -# -# NOTES: See SIP_WRAP_SIP macro from UseSIP.cmake for the usage description. -# -#################################################################### -MACRO(PYQT_WRAP_SIP outfiles) - SIP_WRAP_SIP(${outfiles} ${ARGN} OPTIONS ${PYQT_SIPFLAGS}) -ENDMACRO(PYQT_WRAP_SIP) - -#################################################################### -# -# PYQT_WRAP_QRC macro -# -# Generate Python wrappings for *.qrc files by processing them with pyrcc5. -# -# USAGE: PYQT_WRAP_QRC(output_files qrc_files) -# -# ARGUMENTS: -# output_files [out] variable where output file names are listed to -# qrc_files [in] list of *.qrc files -# -# NOTES: -# - Input files are considered relative to the current source directory. -# - Output files are generated in the current build directory. -# - Macro automatically adds custom build target to generate output files -# -#################################################################### - -MACRO(PYQT_WRAP_QRC outfiles) - FOREACH(_input ${ARGN}) - GET_FILENAME_COMPONENT(_input_name ${_input} NAME) - STRING(REPLACE ".qrc" "_qrc.py" _input_name ${_input_name}) - SET(_output ${CMAKE_CURRENT_BINARY_DIR}/${_input_name}) - ADD_CUSTOM_COMMAND( - OUTPUT ${_output} - COMMAND ${PYQT_PYRCC_PATH} -o ${_output} ${CMAKE_CURRENT_SOURCE_DIR}/${_input} - MAIN_DEPENDENCY ${_input} - ) - SET(${outfiles} ${${outfiles}} ${_output}) - ENDFOREACH() - _PYQT_WRAP_GET_UNIQUE_TARGET_NAME(BUILD_QRC_PY_FILES _uniqueTargetName) - ADD_CUSTOM_TARGET(${_uniqueTargetName} ALL DEPENDS ${${outfiles}}) -ENDMACRO(PYQT_WRAP_QRC) diff --git a/adm_local/cmake_files/UseQtExt.cmake b/adm_local/cmake_files/UseQtExt.cmake deleted file mode 100644 index db787c6ac..000000000 --- a/adm_local/cmake_files/UseQtExt.cmake +++ /dev/null @@ -1,108 +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 -# - -IF (QT_VERSION VERSION_LESS "5.0") - INCLUDE(${QT_USE_FILE}) -ENDIF() - -INSTALL(CODE "MACRO(QT_COMPILE_TS_ON_INSTALL MYLRELEASE MYTSFILE MYFULLDIR MYOUTQMFILE) - FILE(MAKE_DIRECTORY \${MYFULLDIR}) - MESSAGE(STATUS \"Compiling \${MYTSFILE}\") - EXECUTE_PROCESS(COMMAND \${MYLRELEASE} \${MYTSFILE} -qm \${MYFULLDIR}/\${MYOUTQMFILE}) -ENDMACRO(QT_COMPILE_TS_ON_INSTALL)") - -# This MACRO uses the following vars -# - QT_LRELEASE_EXECUTABLE : (given by default by FindQT.cmake) -# -# MYTSFILES containing all ts files to be compiled. -# WHERETOINSTALL contains directory (relative to install_prefix) where to install files after compilation of ts files too qm. -MACRO(QT_INSTALL_TS_RESOURCES MYTSFILES WHERETOINSTALL) - INSTALL(CODE "SET(INSTALL_TS_DIR ${WHERETOINSTALL})") - SET(MYSOURCES) - FOREACH(input ${MYTSFILES}) - GET_FILENAME_COMPONENT(input2 ${input} NAME) - STRING(REGEX REPLACE ".ts" "" base ${input2}) - SET(output "${base}.qm") - INSTALL(CODE "QT_COMPILE_TS_ON_INSTALL( \"${QT_LRELEASE_EXECUTABLE}\" \"${CMAKE_CURRENT_SOURCE_DIR}/${input}\" \"${CMAKE_INSTALL_PREFIX}/\${INSTALL_TS_DIR}\" ${output})") - ENDFOREACH(input ${MYIDLFILES}) -ENDMACRO(QT_INSTALL_TS_RESOURCES) - -MACRO(QT_WRAP_MOC) -IF (QT_VERSION VERSION_LESS "5.0") - QT4_WRAP_CPP(${ARGN}) -ELSE() - QT5_WRAP_CPP(${ARGN}) - # Workaround to avoid problem with bug in moc preprocessor: - # The problem is reproduced on Linux in case if native system Qt is installed - # and "-I/usr/include" parameter is presented in the moc command line before - # custom Qt includes. This bug takes place in Qt-5.6.0 and newer. To avoid this - # bug move "-I/usr/include" parameter in the "moc parameters" file to the end - # of the "include section". - IF (NOT WIN32) - FOREACH(IT ${ARGN}) - GET_FILENAME_COMPONENT(IT ${IT} ABSOLUTE) - GET_FILENAME_COMPONENT(PFILE ${IT} NAME_WE) - SET(OUTFILE ${CMAKE_CURRENT_BINARY_DIR}/moc_${PFILE}.cpp_parameters) - IF(EXISTS ${OUTFILE}) - SET(NEW_CONTENT) - SET(IS_INCLUDE_SECTION TRUE) - SET(HAS_SYSTEM_INC FALSE) - FILE(READ ${OUTFILE} CONTENT) - STRING(REGEX REPLACE "\n" ";" CONTENT "${CONTENT}") - list(REMOVE_DUPLICATES CONTENT) - FOREACH(S ${CONTENT}) - IF("${S}" MATCHES "^-I") - IF("${S}" STREQUAL "-I/usr/include") - SET(HAS_SYSTEM_INC TRUE) - ELSE() - SET(NEW_CONTENT ${NEW_CONTENT} "${S}\n") - ENDIF() - ELSE() - SET(IS_INCLUDE_SECTION FALSE) - ENDIF() - IF(NOT IS_INCLUDE_SECTION) - IF(HAS_SYSTEM_INC) - SET(NEW_CONTENT ${NEW_CONTENT} "-I/usr/include\n") - SET(HAS_SYSTEM_INC FALSE) - ENDIF() - SET(NEW_CONTENT ${NEW_CONTENT} "${S}\n") - ENDIF() - ENDFOREACH() - FILE(WRITE ${OUTFILE} ${NEW_CONTENT}) - ENDIF() - ENDFOREACH() - ENDIF() -ENDIF() -ENDMACRO(QT_WRAP_MOC) - -MACRO(QT_WRAP_UIC) -IF (QT_VERSION VERSION_LESS "5.0") - QT4_WRAP_UI(${ARGN}) -ELSE() - QT5_WRAP_UI(${ARGN}) -ENDIF() -ENDMACRO(QT_WRAP_UIC) - -MACRO(QT_ADD_RESOURCES) -IF (QT_VERSION VERSION_LESS "5.0") - QT4_ADD_RESOURCES(${ARGN}) -ELSE() - QT5_ADD_RESOURCES(${ARGN}) -ENDIF() -ENDMACRO(QT_ADD_RESOURCES) diff --git a/adm_local/cmake_files/UseSIP.cmake b/adm_local/cmake_files/UseSIP.cmake deleted file mode 100644 index 9ccfd07d8..000000000 --- a/adm_local/cmake_files/UseSIP.cmake +++ /dev/null @@ -1,117 +0,0 @@ -# Copyright (C) 2012-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: Vadim SANDLER, Open CASCADE S.A.S. (vadim.sandler@opencascade.com) - -#################################################################### -# -# SIP_WRAP_SIP macro -# -# Generate C++ wrappings for *.sip files by processing them with sip. -# -# USAGE: SIP_WRAP_SIP(output_files sip_file [sip_file...] [OPTIONS options] [SOURCES sources]) -# -# ARGUMENTS: -# output_files [out] variable where output file names are listed to -# sip_file [in] input sip file (a sequence can be provided) -# options [in] additional options to be specified to sip -# sources [in] additional source files to be included into output (see below) -# -# NOTES: -# - Input files are considered relative to the current source directory. -# - Output files are generated in the current build directory. -# -# WARNING: -# - Macro requires class(es) definition in the *.sip file(s) to be started -# on a new line without any preceeding characters. -# - Macro does not properly processes sip features which are wrapped -# with sip conditionals. -# - Macro works correctly only if one single sip module is processed -# (there's only one %Module directive within the set of input sip files). -# - Macro sometimes does not correctly computes full set of source files -# generated by sip; SOURCES option can be used to specify additional source -# files. -# -# TODO: -# - Check if dependency of static sources on generated headers works properly: -# if header is changed, dependant sources should be recompiled. -# - Process sip conditionals. -# - Process several sip modules. -# -#################################################################### -MACRO(SIP_WRAP_SIP outfiles) - SET(_output) - SET(_src_ext ".cc") - SET(_options -s ${_src_ext} -c .) - SET(_sip_files) - SET(_get_options "0") - SET(_get_sources "0") - FOREACH(_input ${ARGN}) - IF(${_input} STREQUAL "OPTIONS") - SET(_get_options "1") - SET(_get_sources "0") - ELSEIF(${_input} STREQUAL "SOURCES") - SET(_get_sources "1") - SET(_get_options "0") - ELSE() - IF(${_get_options} STREQUAL "1") - SET(_options ${_options} ${_input}) - ELSEIF(${_get_sources} STREQUAL "1") - LIST(APPEND _output ${CMAKE_CURRENT_BINARY_DIR}/${_input}) - SET(${outfiles} ${${outfiles}} ${CMAKE_CURRENT_BINARY_DIR}/${_input}) - ELSE() - SET(_sip_files ${_sip_files} ${_input}) - ENDIF() - ENDIF() - ENDFOREACH() - SET(_module_input) - FOREACH(_input ${_sip_files}) - FILE(STRINGS ${_input} _sip_modules REGEX "%Module( |\\()") - FILE(STRINGS ${_input} _sip_classes REGEX "^class ") - FOREACH(_sip_module ${_sip_modules}) - STRING(REGEX MATCH ".*%Module *\\( *name=.*\\).*" _mod_name "${_sip_module}") - IF (_mod_name) - STRING(REGEX REPLACE ".*%Module *\\( *name=(.*).*\\).*" "\\1" _mod_name ${_sip_module}) - ELSE() - STRING(REGEX REPLACE ".*%Module *(.*)" "\\1" _mod_name ${_sip_module}) - ENDIF() - SET(_mod_header "sipAPI${_mod_name}.h") - SET(_mod_source "sip${_mod_name}cmodule${_src_ext}") - LIST(APPEND _output ${CMAKE_CURRENT_BINARY_DIR}/${_mod_source}) - SET(${outfiles} ${${outfiles}} ${CMAKE_CURRENT_BINARY_DIR}/${_mod_source}) - SET(_module_input ${_input}) - ENDFOREACH() - FOREACH(_sip_class ${_sip_classes}) - STRING(REGEX MATCH ".*class +.* *:" _class_name "${_sip_class}") - IF (_class_name) - STRING(REGEX REPLACE ".*class +(.*) *:.*" "\\1" _class_name ${_sip_class}) - ELSE() - STRING(REGEX REPLACE ".*class *(.*)" "\\1" _class_name ${_sip_class}) - ENDIF() - STRING(STRIP ${_class_name} _class_name) - SET(_class_source "sip${_mod_name}${_class_name}${_src_ext}") - LIST(APPEND _output ${CMAKE_CURRENT_BINARY_DIR}/${_class_source}) - SET(${outfiles} ${${outfiles}} ${CMAKE_CURRENT_BINARY_DIR}/${_class_source}) - ENDFOREACH() - ENDFOREACH() - ADD_CUSTOM_COMMAND( - OUTPUT ${_output} - COMMAND ${SIP_EXECUTABLE} ${_options} ${CMAKE_CURRENT_SOURCE_DIR}/${_module_input} - MAIN_DEPENDENCY ${_module_input} - ) -ENDMACRO(SIP_WRAP_SIP) diff --git a/adm_local/cmake_files/deprecated/CMakeLists.txt b/adm_local/cmake_files/deprecated/CMakeLists.txt deleted file mode 100644 index 9c6cc38fe..000000000 --- a/adm_local/cmake_files/deprecated/CMakeLists.txt +++ /dev/null @@ -1,35 +0,0 @@ -# Copyright (C) 2012-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 -# - -# =============================================================== -# Files to be installed -# =============================================================== - -# These files are data, module or lib files -SET(_adm_data - FindCAS.cmake - FindGUI.cmake - FindOPENGL.cmake - FindQT4.cmake - FindQWT.cmake - FindSIPPYQT.cmake - FindVTK.cmake - UseQT4EXT.cmake -) -INSTALL(FILES ${_adm_data} DESTINATION ${SALOME_INSTALL_CMAKE_LOCAL}/deprecated) \ No newline at end of file diff --git a/adm_local/cmake_files/deprecated/FindCAS.cmake b/adm_local/cmake_files/deprecated/FindCAS.cmake deleted file mode 100644 index ed79f6a42..000000000 --- a/adm_local/cmake_files/deprecated/FindCAS.cmake +++ /dev/null @@ -1,204 +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 -# - -SET(CASROOT $ENV{CASROOT}) - -# SET(OCC_VERSION_MAJOR 6) -# SET(OCC_VERSION_MINOR 3) -# SET(OCC_VERSION_MAINTENANCE 10) -SET(CAS_VERSION_DEVELOPMENT 0) - -FIND_FILE(ff Standard_Version.hxx ${CASROOT}/include/opencascade ${CASROOT}/inc) -IF(ff) - FILE(STRINGS ${ff} CAS_VERSION_DEVELOPMENT_STR - REGEX "^ *#define OCC_VERSION_DEVELOPMENT *\"dev\".*$") - IF(CAS_VERSION_DEVELOPMENT_STR) - SET(CAS_VERSION_DEVELOPMENT 1) - ENDIF(CAS_VERSION_DEVELOPMENT_STR) -ENDIF(ff) - -SET(CAS_CPPFLAGS) -# SET(CAS_CPPFLAGS ${CAS_CPPFLAGS} -DOCC_VERSION_MAJOR=${OCC_VERSION_MAJOR}) -# SET(CAS_CPPFLAGS ${CAS_CPPFLAGS} -DOCC_VERSION_MINOR=${OCC_VERSION_MINOR}) -# SET(CAS_CPPFLAGS ${CAS_CPPFLAGS} -DOCC_VERSION_MAINTENANCE=${OCC_VERSION_MAINTENANCE}) -SET(CAS_CPPFLAGS ${CAS_CPPFLAGS} -DLIN -DLINTEL -DCSFDB) -SET(CAS_DEFINITIONS "-DLIN -DLINTEL -DCSFDB") -SET(CAS_CPPFLAGS ${CAS_CPPFLAGS} -DNo_exception) -SET(CAS_DEFINITIONS "${CAS_DEFINITIONS} -DNo_exception") -# No config.h file in the OPEN CASCADE on WINDOWS platform -IF(NOT WINDOWS) - SET(CAS_CPPFLAGS ${CAS_CPPFLAGS} -DHAVE_CONFIG_H) - SET(CAS_DEFINITIONS "${CAS_DEFINITIONS} -DHAVE_CONFIG_H") -ENDIF(NOT WINDOWS) -SET(CAS_CPPFLAGS ${CAS_CPPFLAGS} -DHAVE_LIMITS_H) -SET(CAS_DEFINITIONS "${CAS_DEFINITIONS} -DHAVE_LIMITS_H") -SET(CAS_CPPFLAGS ${CAS_CPPFLAGS} -I${CASROOT}/inc) # to be removed -SET(CAS_INCLUDE_DIRS ${CASROOT}/inc) - -IF(CMAKE_SIZEOF_VOID_P STREQUAL 8) - SET(CAS_CPPFLAGS ${CAS_CPPFLAGS} -D_OCC64) -ENDIF(CMAKE_SIZEOF_VOID_P STREQUAL 8) - -IF(CAS_VERSION_DEVELOPMENT STREQUAL 1) - SET(CAS_CPPFLAGS "${CAS_CPPFLAGS} -DCAS_VERSION_DEVELOPMENT") -ENDIF(CAS_VERSION_DEVELOPMENT STREQUAL 1) - -IF(WINDOWS) - IF(CMAKE_BUILD_TYPE STREQUAL Debug) - SET(CASROOT_LIBDIR ${CASROOT}/win32/libd) - ELSE(CMAKE_BUILD_TYPE STREQUAL Debug) - SET(CASROOT_LIBDIR ${CASROOT}/win32/lib) - ENDIF(CMAKE_BUILD_TYPE STREQUAL Debug) -ELSE(WINDOWS) - SET(CASROOT_LIBDIR ${CASROOT}/lib) -ENDIF(WINDOWS) - -SET(CMAKE_LIBRARY_PATH ${CMAKE_LIBRARY_PATH} ${CASROOT_LIBDIR}) - -IF(NOT WINDOWS) - FIND_LIBRARY(Xmu Xmu) - IF(Xmu) - SET(CAS_LDPATH ${Xmu}) - ENDIF(Xmu) -ENDIF(NOT WINDOWS) - -#FIND_LIBRARY(BinLPlugin BinLPlugin) -#FIND_LIBRARY(BinPlugin BinPlugin) -#FIND_LIBRARY(BinTObjPlugin BinTObjPlugin) -#FIND_LIBRARY(BinXCAFPlugin BinXCAFPlugin) -FIND_LIBRARY(FWOSPlugin FWOSPlugin) -# FIND_LIBRARY(mscmd mscmd) -FIND_LIBRARY(PTKernel PTKernel) -FIND_LIBRARY(StdLPlugin StdLPlugin) -FIND_LIBRARY(StdPlugin StdPlugin) -FIND_LIBRARY(TKAdvTools TKAdvTools) -FIND_LIBRARY(TKBin TKBin) -FIND_LIBRARY(TKBinL TKBinL) -FIND_LIBRARY(TKBinTObj TKBinTObj) -FIND_LIBRARY(TKBinXCAF TKBinXCAF) -FIND_LIBRARY(TKBO TKBO) -FIND_LIBRARY(TKBool TKBool) -FIND_LIBRARY(TKBRep TKBRep) -FIND_LIBRARY(TKCAF TKCAF) -FIND_LIBRARY(TKCDF TKCDF) -# FIND_LIBRARY(TKCDLFront TKCDLFront) -# FIND_LIBRARY(TKCPPClient TKCPPClient) -# FIND_LIBRARY(TKCPPExt TKCPPExt) -# FIND_LIBRARY(TKCPPIntExt TKCPPIntExt) -# FIND_LIBRARY(TKCPPJini TKCPPJini) -# FIND_LIBRARY(TKCSFDBSchema TKCSFDBSchema) -# FIND_LIBRARY(TKDCAF TKDCAF) -# FIND_LIBRARY(TKDraw TKDraw) -FIND_LIBRARY(TKernel TKernel) -FIND_LIBRARY(TKFeat TKFeat) -FIND_LIBRARY(TKFillet TKFillet) -FIND_LIBRARY(TKG2d TKG2d) -FIND_LIBRARY(TKG3d TKG3d) -FIND_LIBRARY(TKGeomAlgo TKGeomAlgo) -FIND_LIBRARY(TKGeomBase TKGeomBase) -FIND_LIBRARY(TKHLR TKHLR) -# FIND_LIBRARY(TKIDLFront TKIDLFront) -FIND_LIBRARY(TKIGES TKIGES) -FIND_LIBRARY(TKLCAF TKLCAF) -FIND_LIBRARY(TKMath TKMath) -FIND_LIBRARY(TKMesh TKMesh) -FIND_LIBRARY(TKMeshVS TKMeshVS) -FIND_LIBRARY(TKNIS TKNIS) -FIND_LIBRARY(TKOffset TKOffset) -FIND_LIBRARY(TKOpenGl TKOpenGl) -FIND_LIBRARY(TKPCAF TKPCAF) -FIND_LIBRARY(TKPLCAF TKPLCAF) -FIND_LIBRARY(TKPrim TKPrim) -FIND_LIBRARY(TKPShape TKPShape) -FIND_LIBRARY(TKService TKService) -FIND_LIBRARY(TKShapeSchema TKShapeSchema) -FIND_LIBRARY(TKShHealing TKShHealing) -FIND_LIBRARY(TKStdLSchema TKStdLSchema) -FIND_LIBRARY(TKStdSchema TKStdSchema) -FIND_LIBRARY(TKSTEP TKSTEP) -FIND_LIBRARY(TKSTEP209 TKSTEP209) -FIND_LIBRARY(TKSTEPAttr TKSTEPAttr) -FIND_LIBRARY(TKSTEPBase TKSTEPBase) -FIND_LIBRARY(TKSTL TKSTL) -# FIND_LIBRARY(TKTCPPExt TKTCPPExt) -FIND_LIBRARY(TKTObj TKTObj) -# FIND_LIBRARY(TKTObjDRAW TKTObjDRAW) -FIND_LIBRARY(TKTopAlgo TKTopAlgo) -# FIND_LIBRARY(TKTopTest TKTopTest) -FIND_LIBRARY(TKV2d TKV2d) -FIND_LIBRARY(TKV3d TKV3d) -# FIND_LIBRARY(TKViewerTest TKViewerTest) -FIND_LIBRARY(TKVRML TKVRML) -# FIND_LIBRARY(TKWOK TKWOK) -# FIND_LIBRARY(TKWOKTcl TKWOKTcl) -FIND_LIBRARY(TKXCAF TKXCAF) -FIND_LIBRARY(TKXCAFSchema TKXCAFSchema) -# FIND_LIBRARY(TKXDEDRAW TKXDEDRAW) -FIND_LIBRARY(TKXDEIGES TKXDEIGES) -FIND_LIBRARY(TKXDESTEP TKXDESTEP) -FIND_LIBRARY(TKXMesh TKXMesh) -FIND_LIBRARY(TKXml TKXml) -FIND_LIBRARY(TKXmlL TKXmlL) -FIND_LIBRARY(TKXmlTObj TKXmlTObj) -FIND_LIBRARY(TKXmlXCAF TKXmlXCAF) -FIND_LIBRARY(TKXSBase TKXSBase) -# FIND_LIBRARY(TKXSDRAW TKXSDRAW) -# FIND_LIBRARY(wokcmd wokcmd) -# FIND_LIBRARY(wokdeliverysteps wokdeliverysteps) -# FIND_LIBRARY(wokdfltsteps wokdfltsteps) -# FIND_LIBRARY(wokobjssteps wokobjssteps) -# FIND_LIBRARY(wokorbixsteps wokorbixsteps) -# FIND_LIBRARY(woksteps woksteps) -# FIND_LIBRARY(woktoolscmd woktoolscmd) -# FIND_LIBRARY(wokutilscmd wokutilscmd) -FIND_LIBRARY(XCAFPlugin XCAFPlugin) -FIND_LIBRARY(XmlLPlugin XmlLPlugin) -FIND_LIBRARY(XmlPlugin XmlPlugin) -FIND_LIBRARY(XmlTObjPlugin XmlTObjPlugin) -FIND_LIBRARY(XmlXCAFPlugin XmlXCAFPlugin) - -SET(CAS_KERNEL ${TKernel} ${TKMath}) -SET(CAS_OCAF ${TKernel} ${TKMath} ${TKCDF} ${TKLCAF}) -SET(CAS_VIEWER ${TKService} ${TKV3d} ${TKG3d} ${TKGeomBase} ${TKBRep}) -SET(CAS_OCAFVIS ${TKCAF} ${TKBRep} ${TKG2d}) -SET(CAS_MODELER ${TKG3d} ${TKGeomBase} ${TKGeomAlgo} ${TKBRep} ${TKTopAlgo} ${TKG2d}) - -SET(TKV3d_EA ${TKernel} ${TKMath} ${TKV3d}) -SET(TKBool_EA ${TKernel} ${TKMath} ${TKBRep} ${TKG2d} ${TKG3d} ${TKGeomBase} ${TKGeomAlgo} ${TKTopAlgo} ${TKBool}) -SET(TKBRep_EA ${TKernel} ${TKMath} ${TKBRep}) -SET(TKIGES_EA ${TKernel} ${TKMath} ${TKXSBase} ${TKBRep} ${TKIGES}) -SET(TKSTEP_EA ${TKernel} ${TKMath} ${TKXSBase} ${TKBRep} ${TKSTEP}) -SET(TKSTL_EA ${TKernel} ${TKMath} ${TKSTL}) -SET(TKCAF_EA ${TKPrim} ${TKCAF}) - -SET(TKV3d ${TKV3d_EA}) -SET(TKBool ${TKBool_EA}) -SET(TKBRep ${TKBRep_EA}) -SET(TKIGES ${TKIGES_EA}) -SET(TKSTEP ${TKSTEP_EA}) -SET(TKSTL ${TKSTL_EA}) -SET(TKCAF ${TKCAF_EA}) - -IF(StdPlugin) - SET(CAS_STDPLUGIN StdPlugin) -ELSE(StdPlugin) - IF(TKStdLSchema) - SET(CAS_STDPLUGIN TKStdSchema) - ENDIF(TKStdLSchema) -ENDIF(StdPlugin) \ No newline at end of file diff --git a/adm_local/cmake_files/deprecated/FindGUI.cmake b/adm_local/cmake_files/deprecated/FindGUI.cmake deleted file mode 100644 index ef595dd54..000000000 --- a/adm_local/cmake_files/deprecated/FindGUI.cmake +++ /dev/null @@ -1,63 +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 -# - -SET(GUI_CXXFLAGS -I${GUI_ROOT_DIR}/include/salome) - -FIND_LIBRARY(caf caf ${GUI_ROOT_DIR}/lib/salome) -FIND_LIBRARY(CAM CAM ${GUI_ROOT_DIR}/lib/salome) -FIND_LIBRARY(CASCatch CASCatch ${GUI_ROOT_DIR}/lib/salome) -FIND_LIBRARY(DDS DDS ${GUI_ROOT_DIR}/lib/salome) -FIND_LIBRARY(Event Event ${GUI_ROOT_DIR}/lib/salome) -FIND_LIBRARY(GLViewer GLViewer ${GUI_ROOT_DIR}/lib/salome) -FIND_LIBRARY(LightApp LightApp ${GUI_ROOT_DIR}/lib/salome) -FIND_LIBRARY(LogWindow LogWindow ${GUI_ROOT_DIR}/lib/salome) -FIND_LIBRARY(ObjBrowser ObjBrowser ${GUI_ROOT_DIR}/lib/salome) -FIND_LIBRARY(OCCViewer OCCViewer ${GUI_ROOT_DIR}/lib/salome) -FIND_LIBRARY(OpenGLUtils OpenGLUtils ${GUI_ROOT_DIR}/lib/salome) -FIND_LIBRARY(Plot2d Plot2d ${GUI_ROOT_DIR}/lib/salome) -FIND_LIBRARY(PyConsole PyConsole ${GUI_ROOT_DIR}/lib/salome) -FIND_LIBRARY(PyInterp PyInterp ${GUI_ROOT_DIR}/lib/salome) -FIND_LIBRARY(QDS QDS ${GUI_ROOT_DIR}/lib/salome) -FIND_LIBRARY(qtx qtx ${GUI_ROOT_DIR}/lib/salome) -FIND_LIBRARY(QxScene QxScene ${GUI_ROOT_DIR}/lib/salome) -FIND_LIBRARY(SalomeApp SalomeApp ${GUI_ROOT_DIR}/lib/salome) -FIND_LIBRARY(SalomeIDLGUI SalomeIDLGUI ${GUI_ROOT_DIR}/lib/salome) -FIND_LIBRARY(SalomeObject SalomeObject ${GUI_ROOT_DIR}/lib/salome) -FIND_LIBRARY(SalomePrs SalomePrs ${GUI_ROOT_DIR}/lib/salome) -FIND_LIBRARY(SalomePyQtGUILight SalomePyQtGUILight ${GUI_ROOT_DIR}/lib/salome) -FIND_LIBRARY(SalomePyQtGUI SalomePyQtGUI ${GUI_ROOT_DIR}/lib/salome) -FIND_LIBRARY(SalomePyQt SalomePyQt ${GUI_ROOT_DIR}/lib/salome) -FIND_LIBRARY(SalomePy SalomePy ${GUI_ROOT_DIR}/lib/salome) -FIND_LIBRARY(SalomeSession SalomeSession ${GUI_ROOT_DIR}/lib/salome) -FIND_LIBRARY(SalomeStyle SalomeStyle ${GUI_ROOT_DIR}/lib/salome) -FIND_LIBRARY(SOCC SOCC ${GUI_ROOT_DIR}/lib/salome) -FIND_LIBRARY(SPlot2d SPlot2d ${GUI_ROOT_DIR}/lib/salome) -FIND_LIBRARY(std std ${GUI_ROOT_DIR}/lib/salome) -FIND_LIBRARY(SUITApp SUITApp ${GUI_ROOT_DIR}/lib/salome) -FIND_LIBRARY(suit suit ${GUI_ROOT_DIR}/lib/salome) -FIND_LIBRARY(SVTK SVTK ${GUI_ROOT_DIR}/lib/salome) -FIND_LIBRARY(ToolsGUI ToolsGUI ${GUI_ROOT_DIR}/lib/salome) -FIND_LIBRARY(ViewerTools ViewerTools ${GUI_ROOT_DIR}/lib/salome) -FIND_LIBRARY(VTKViewer VTKViewer ${GUI_ROOT_DIR}/lib/salome) -FIND_LIBRARY(vtkEDFOverloads vtkEDFOverloads ${GUI_ROOT_DIR}/lib/paraview) -FIND_LIBRARY(vtkTools vtkTools ${GUI_ROOT_DIR}/lib/salome) -FIND_LIBRARY(SalomeGuiHelpers SalomeGuiHelpers ${GUI_ROOT_DIR}/lib/salome) -FIND_LIBRARY(SalomeTreeData SalomeTreeData ${GUI_ROOT_DIR}/lib/salome) -FIND_LIBRARY(ImageComposer ImageComposer ${GUI_ROOT_DIR}/lib/salome) -FIND_LIBRARY(GraphicsView GraphicsView ${GUI_ROOT_DIR}/lib/salome) diff --git a/adm_local/cmake_files/deprecated/FindOPENGL.cmake b/adm_local/cmake_files/deprecated/FindOPENGL.cmake deleted file mode 100644 index ee986fea0..000000000 --- a/adm_local/cmake_files/deprecated/FindOPENGL.cmake +++ /dev/null @@ -1,32 +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 -# - -IF(${WINDOWS}) - IF("${CMAKE_SIZEOF_VOID_P}" EQUAL "8") # if platform is Windows 64 bit - FIND_LIBRARY(OpenGL_LIB OpenGL32 HINTS "C:/Program Files/Microsoft SDKs/Windows/v6.0A/lib/x64") - FIND_LIBRARY(GlU_LIB GlU32 HINTS "C:/Program Files/Microsoft SDKs/Windows/v6.0A/lib/x64") - ELSE("${CMAKE_SIZEOF_VOID_P}" EQUAL "8") - FIND_LIBRARY(OpenGL_LIB OpenGL32 "C:/Program Files/Microsoft SDKs/Windows/v6.0A/lib") - FIND_LIBRARY(GlU_LIB GlU32 "C:/Program Files/Microsoft SDKs/Windows/v6.0A/lib") - ENDIF("${CMAKE_SIZEOF_VOID_P}" EQUAL "8") -ELSE(${WINDOWS}) - FIND_LIBRARY(OpenGL_LIB GL) - FIND_LIBRARY(GlU_LIB GLU) -ENDIF(${WINDOWS}) -SET(OGL_LIBS ${OpenGL_LIB} ${GlU_LIB}) diff --git a/adm_local/cmake_files/deprecated/FindQT4.cmake b/adm_local/cmake_files/deprecated/FindQT4.cmake deleted file mode 100644 index cb4eaa03b..000000000 --- a/adm_local/cmake_files/deprecated/FindQT4.cmake +++ /dev/null @@ -1,35 +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 -# - -INCLUDE(FindQt4) -INCLUDE(UseQt4) -SET(QT_INCLUDE_DIRS ${QT_INCLUDES}) -SET(DIRS) -FOREACH(D ${QT_INCLUDES}) -SET(DIRS ${DIRS} -I${D}) -ENDFOREACH(D ${QT_INCLUDES}) -SET(QT_INCLUDES ${DIRS}) # to be removed -SET(QT_INCLUDES ${QT_INCLUDES} -DQT_THREAD_SUPPORT) # to be removed -SET(QT_DEFINITIONS -DQT_THREAD_SUPPORT) -SET(QT_MT_LIBS ${QT_LIBRARIES} ${QT_QTXML_LIBRARY} ${QT_QTOPENGL_LIBRARY} ${QT_QTWEBKIT_LIBRARY}) -SET(QT_LIBS ${QT_MT_LIBS}) -SET(qt4_ldflags ${QT_MT_LIBS}) -SET(QT_LIBS ${QT_MT_LIBS}) - -FIND_PROGRAM(QT_LRELEASE_EXECUTABLE lrelease) diff --git a/adm_local/cmake_files/deprecated/FindQWT.cmake b/adm_local/cmake_files/deprecated/FindQWT.cmake deleted file mode 100644 index 09182edfd..000000000 --- a/adm_local/cmake_files/deprecated/FindQWT.cmake +++ /dev/null @@ -1,41 +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 -# - -FILE(TO_CMAKE_PATH "$ENV{QWTHOME}" QWTHOME) -IF(NOT QWTHOME) - SET(QWTHOME /usr) -ENDIF(NOT QWTHOME) - -FIND_PATH(QWT_INCLUDE_DIR qwt_plot.h PATHS ${QWTHOME}/include ${QWTHOME}/include/qwt) -SET(QWT_INCLUDES -I${QWT_INCLUDE_DIR}) # to remove -SET(QWT_INCLUDE_DIRS ${QWT_INCLUDE_DIR}) -IF(WINDOWS) -SET(QWT_INCLUDES ${QWT_INCLUDES} -DQWT_DLL) # to remove -SET(QWT_DEFINITIONS "-DQWT_DLL") -ENDIF(WINDOWS) - -IF(WINDOWS) -IF(CMAKE_BUILD_TYPE STREQUAL Debug) -FIND_LIBRARY(QWT_LIBS qwtd5 ${QWTHOME}/lib) -ELSE(CMAKE_BUILD_TYPE STREQUAL Debug) -FIND_LIBRARY(QWT_LIBS qwt5 ${QWTHOME}/lib) -ENDIF(CMAKE_BUILD_TYPE STREQUAL Debug) -ELSE(WINDOWS) -FIND_LIBRARY(QWT_LIBS qwt HINTS ${QWTHOME} PATH_SUFFIXES lib lib64) -ENDIF(WINDOWS) diff --git a/adm_local/cmake_files/deprecated/FindSIPPYQT.cmake b/adm_local/cmake_files/deprecated/FindSIPPYQT.cmake deleted file mode 100644 index 45178d15e..000000000 --- a/adm_local/cmake_files/deprecated/FindSIPPYQT.cmake +++ /dev/null @@ -1,78 +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 -# - -FIND_PROGRAM(SIP_EXECUTABLE sip) - -SET(SIP_ROOT ${SIP_EXECUTABLE}) -IF(SIP_ROOT) -GET_FILENAME_COMPONENT(SIP_ROOT ${SIP_ROOT} PATH) -GET_FILENAME_COMPONENT(SIP_ROOT ${SIP_ROOT} PATH) -ENDIF(SIP_ROOT) - -SET(SIP_INCLUDES -I${SIP_ROOT}/include/python${PYTHON_VERSION}) # to be removed -SET(SIP_INCLUDE_DIRS ${SIP_ROOT}/include/python${PYTHON_VERSION}) -IF(WINDOWS) - SET(SIP_INCLUDES ${SIP_INCLUDES} -I${SIP_ROOT}/include) # to be removed - SET(SIP_INCLUDE_DIRS ${SIP_INCLUDE_DIRS} ${SIP_ROOT}/include) -ENDIF(WINDOWS) - -IF(WINDOWS) - FIND_PROGRAM(PYUIC_EXECUTABLE NAMES pyuic4 pyuic4.bat) -ELSE(WINDOWS) - FIND_PROGRAM(PYUIC_EXECUTABLE NAMES pyuic4) -ENDIF(WINDOWS) - -SET(PYUIC_ROOT ${PYUIC_EXECUTABLE}) -IF(PYUIC_ROOT) -GET_FILENAME_COMPONENT(PYUIC_ROOT ${PYUIC_ROOT} PATH) -GET_FILENAME_COMPONENT(PYUIC_ROOT ${PYUIC_ROOT} PATH) -ENDIF(PYUIC_ROOT) - -SET(PYQT_SIPS $ENV{PYQT_SIPS}) -IF(NOT PYQT_SIPS) - IF(WINDOWS) - SET(PYQT_SIPS ${PYUIC_ROOT}/sip) - ELSE(WINDOWS) - IF(PYUIC_ROOT STREQUAL /usr) - SET(PYQT_SIPS ${PYUIC_ROOT}/share/sip/PyQt4) - ELSE(PYUIC_ROOT STREQUAL /usr) - SET(PYQT_SIPS ${PYUIC_ROOT}/share/sip) - ENDIF(PYUIC_ROOT STREQUAL /usr) - ENDIF(WINDOWS) -ENDIF(NOT PYQT_SIPS) - -SET(PYQT_INCLUDES -I${PYQT_SIPS}) -SET(PYQT_INCLUDES ${PYQT_INCLUDES} -I${PYQT_SIPS}/QtCore -I${PYQT_SIPS}/QtGui) -SET(PYQT_INCLUDES ${PYQT_INCLUDES} -I${PYQT_SIPS}/QtXml -I${PYQT_SIPS}/QtOpenGL) -SET(PYQT_INCLUDES ${PYQT_INCLUDES} -I${PYQT_SIPS}/QtAssistant -I${PYQT_SIPS}/QtDesigner) -SET(PYQT_INCLUDES ${PYQT_INCLUDES} -I${PYQT_SIPS}/QtNetwork -I${PYQT_SIPS}/QtSql) -SET(PYQT_INCLUDES ${PYQT_INCLUDES} -I${PYQT_SIPS}/QtSvg -I${PYQT_SIPS}/QtTest) - -EXECUTE_PROCESS( - COMMAND ${PYTHON_EXECUTABLE} -c "import re, PyQt4.pyqtconfig ; s = PyQt4.pyqtconfig.Configuration().pyqt_sip_flags ; print s;" - OUTPUT_VARIABLE COMPILE_FLAGS - OUTPUT_STRIP_TRAILING_WHITESPACE - ) -string(REPLACE " " ";" FLAGS_LIST ${COMPILE_FLAGS}) -FOREACH(FLG ${FLAGS_LIST}) -SET( PYQT_SIPFLAGS ${PYQT_SIPFLAGS} ${FLG}) -ENDFOREACH(FLG ${FLAGS_LIST}) - -SET( PYQT_SIPFLAGS ${PYQT_SIPFLAGS} -s .cc -c . ) -SET( PYQT_SIPFLAGS ${PYQT_SIPFLAGS} ${PYQT_INCLUDES} ) \ No newline at end of file diff --git a/adm_local/cmake_files/deprecated/FindVTK.cmake b/adm_local/cmake_files/deprecated/FindVTK.cmake deleted file mode 100644 index 456cf5cf7..000000000 --- a/adm_local/cmake_files/deprecated/FindVTK.cmake +++ /dev/null @@ -1,22 +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 -# - -CMAKE_MINIMUM_REQUIRED(VERSION 2.8.7 FATAL_ERROR) -FIND_PACKAGE(VTK 6.0 REQUIRED NO_MODULE) -INCLUDE(${VTK_USE_FILE}) diff --git a/adm_local/cmake_files/deprecated/UseQT4EXT.cmake b/adm_local/cmake_files/deprecated/UseQT4EXT.cmake deleted file mode 100644 index 4e527f49f..000000000 --- a/adm_local/cmake_files/deprecated/UseQT4EXT.cmake +++ /dev/null @@ -1,40 +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 -# - -INSTALL(CODE "MACRO(QT4_COMPILE_TS_ON_INSTALL MYLRELEASE MYTSFILE MYFULLDIR MYOUTQMFILE) - FILE(MAKE_DIRECTORY \${MYFULLDIR}) - MESSAGE(STATUS \"Compiling \${MYTSFILE}\") - EXECUTE_PROCESS(COMMAND \${MYLRELEASE} \${MYTSFILE} -qm \${MYFULLDIR}/\${MYOUTQMFILE}) -ENDMACRO(QT4_COMPILE_TS_ON_INSTALL)") - -# This MACRO uses the following vars -# - QT_LRELEASE_EXECUTABLE : (given by default by FindQT.cmake) -# -# MYTSFILES containing all ts files to be compiled. -# WHERETOINSTALL contains directory (relative to install_prefix) where to install files after compilation of ts files too qm. -MACRO(QT4_INSTALL_TS_RESOURCES MYTSFILES WHERETOINSTALL) - INSTALL(CODE "SET(INSTALL_TS_DIR ${WHERETOINSTALL})") - SET(MYSOURCES) - FOREACH(input ${MYTSFILES}) - GET_FILENAME_COMPONENT(input2 ${input} NAME) - STRING(REGEX REPLACE ".ts" "" base ${input2}) - SET(output "${base}.qm") - INSTALL(CODE "QT4_COMPILE_TS_ON_INSTALL( \"${QT_LRELEASE_EXECUTABLE}\" \"${CMAKE_CURRENT_SOURCE_DIR}/${input}\" \"${CMAKE_INSTALL_PREFIX}/\${INSTALL_TS_DIR}\" ${output})") - ENDFOREACH(input ${MYIDLFILES}) -ENDMACRO(QT4_INSTALL_TS_RESOURCES)