From b1fb6ee9908a5edfde670b109a442f8b9463e02c Mon Sep 17 00:00:00 2001
From: barate <barate>
Date: Thu, 14 Feb 2013 13:57:34 +0000
Subject: [PATCH] Remove unused CMake macros that have been moved to deprecated
 folder

---
 adm_local/cmake_files/CMakeLists.txt    |  6 +-
 adm_local/cmake_files/FindOPENGL.cmake  | 27 ---------
 adm_local/cmake_files/FindQT4.cmake     | 35 -----------
 adm_local/cmake_files/FindSIPPYQT.cmake | 78 -------------------------
 adm_local/cmake_files/FindVTK.cmake     | 68 ---------------------
 adm_local/cmake_files/Makefile.am       |  5 --
 6 files changed, 1 insertion(+), 218 deletions(-)
 delete mode 100644 adm_local/cmake_files/FindOPENGL.cmake
 delete mode 100644 adm_local/cmake_files/FindQT4.cmake
 delete mode 100644 adm_local/cmake_files/FindSIPPYQT.cmake
 delete mode 100644 adm_local/cmake_files/FindVTK.cmake

diff --git a/adm_local/cmake_files/CMakeLists.txt b/adm_local/cmake_files/CMakeLists.txt
index 229b3b476..3a518eb8c 100755
--- a/adm_local/cmake_files/CMakeLists.txt
+++ b/adm_local/cmake_files/CMakeLists.txt
@@ -26,12 +26,8 @@ ADD_SUBDIRECTORY(deprecated)
 # These files are data, module or lib files
 SET(DATA
   FindCAS.cmake
-  FindOPENGL.cmake
-  FindQT4.cmake
   UseQT4EXT.cmake
   FindQWT.cmake
-  FindSIPPYQT.cmake
-  FindVTK.cmake
   FindGUI.cmake  
 )
-INSTALL(FILES ${DATA} DESTINATION ${GUI_admlocalcmake})
\ No newline at end of file
+INSTALL(FILES ${DATA} DESTINATION ${GUI_admlocalcmake})
diff --git a/adm_local/cmake_files/FindOPENGL.cmake b/adm_local/cmake_files/FindOPENGL.cmake
deleted file mode 100644
index d7e8d4fed..000000000
--- a/adm_local/cmake_files/FindOPENGL.cmake
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright (C) 2007-2012  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.
-#
-# 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})
-  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")
-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/FindQT4.cmake b/adm_local/cmake_files/FindQT4.cmake
deleted file mode 100644
index 10419225b..000000000
--- a/adm_local/cmake_files/FindQT4.cmake
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright (C) 2007-2012  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.
-#
-# 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/FindSIPPYQT.cmake b/adm_local/cmake_files/FindSIPPYQT.cmake
deleted file mode 100644
index e9f5e55d8..000000000
--- a/adm_local/cmake_files/FindSIPPYQT.cmake
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright (C) 2007-2012  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.
-#
-# 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/FindVTK.cmake b/adm_local/cmake_files/FindVTK.cmake
deleted file mode 100644
index 4e0871c89..000000000
--- a/adm_local/cmake_files/FindVTK.cmake
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright (C) 2007-2012  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.
-#
-# 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(FindVTK)
-
-SET(VTK_INCLUDES)
-FOREACH(dir ${VTK_INCLUDE_DIRS})
-  SET(VTK_INCLUDES ${VTK_INCLUDES} -I${dir})
-ENDFOREACH(dir ${VTK_INCLUDE_DIRS})
-
-SET(VTK_LIBS)
-FIND_LIBRARY(VTK_COMMON vtkCommon PATHS ${VTK_LIBRARY_DIRS} NO_DEFAULT_PATH)
-SET(VTK_LIBS ${VTK_LIBS} ${VTK_COMMON})
-FIND_LIBRARY(VTK_GRAPHICS vtkGraphics PATHS ${VTK_LIBRARY_DIRS} NO_DEFAULT_PATH)
-SET(VTK_LIBS ${VTK_LIBS} ${VTK_GRAPHICS})
-FIND_LIBRARY(VTK_IMAGING vtkImaging PATHS ${VTK_LIBRARY_DIRS} NO_DEFAULT_PATH)
-SET(VTK_LIBS ${VTK_LIBS} ${VTK_IMAGING})
-FIND_LIBRARY(VTK_FILTERING vtkFiltering PATHS ${VTK_LIBRARY_DIRS} NO_DEFAULT_PATH)
-SET(VTK_LIBS ${VTK_LIBS} ${VTK_FILTERING})
-FIND_LIBRARY(VTK_IO vtkIO PATHS ${VTK_LIBRARY_DIRS} NO_DEFAULT_PATH)
-SET(VTK_LIBS ${VTK_LIBS} ${VTK_IO})
-FIND_LIBRARY(VTK_RENDERING vtkRendering PATHS ${VTK_LIBRARY_DIRS} NO_DEFAULT_PATH)
-SET(VTK_LIBS ${VTK_LIBS} ${VTK_RENDERING})
-FIND_LIBRARY(VTK_HYBRID vtkHybrid PATHS ${VTK_LIBRARY_DIRS} NO_DEFAULT_PATH)
-SET(VTK_LIBS ${VTK_LIBS} ${VTK_HYBRID})
-FIND_LIBRARY(VTK_PARALLEL vtkParallel PATHS ${VTK_LIBRARY_DIRS} NO_DEFAULT_PATH)
-SET(VTK_LIBS ${VTK_LIBS} ${VTK_PARALLEL})
-FIND_LIBRARY(VTK_WIDGETS vtkWidgets PATHS ${VTK_LIBRARY_DIRS} NO_DEFAULT_PATH)
-SET(VTK_LIBS ${VTK_LIBS} ${VTK_WIDGETS})
-FIND_LIBRARY(VTK_GENERIC_FILTERING vtkGenericFiltering PATHS ${VTK_LIBRARY_DIRS} NO_DEFAULT_PATH)
-SET(VTK_LIBS ${VTK_LIBS} ${VTK_GENERIC_FILTERING})
-FIND_LIBRARY(VTK_INFOVIS vtkInfovis PATHS ${VTK_LIBRARY_DIRS} NO_DEFAULT_PATH)
-SET(VTK_LIBS ${VTK_LIBS} ${VTK_INFOVIS})
-FIND_LIBRARY(VTK_VOLUME_RENDERING vtkVolumeRendering PATHS ${VTK_LIBRARY_DIRS} NO_DEFAULT_PATH)
-SET(VTK_LIBS ${VTK_LIBS} ${VTK_VOLUME_RENDERING})
-
-FIND_LIBRARY(vtkCommonPythonD vtkCommonPythonD PATHS ${VTK_LIBRARY_DIRS} NO_DEFAULT_PATH)
-FIND_LIBRARY(vtkGraphicsPythonD vtkGraphicsPythonD PATHS ${VTK_LIBRARY_DIRS} NO_DEFAULT_PATH)
-FIND_LIBRARY(vtkImagingPythonD vtkImagingPythonD PATHS ${VTK_LIBRARY_DIRS} NO_DEFAULT_PATH)
-FIND_LIBRARY(vtkPythonCore vtkPythonCore PATHS ${VTK_LIBRARY_DIRS} NO_DEFAULT_PATH)
-
-
-#IF(NOT WINDOWS)
-#  IF(VTK_MAJOR_VERSION STREQUAL 5)
-#    IF(VTK_MINOR_VERSION STREQUAL 0)
-#      SET(VTK_INCLUDES ${VTK_INCLUDES} -Wno-deprecated)
-#    ENDIF(VTK_MINOR_VERSION STREQUAL 0)
-#  ENDIF(VTK_MAJOR_VERSION STREQUAL 5)
-#ENDIF(NOT WINDOWS)
-
-SET(VTK_INCLUDES ${VTK_INCLUDES} -DVTK_EXCLUDE_STRSTREAM_HEADERS)
-SET(VTK_DEFINITIONS -DVTK_EXCLUDE_STRSTREAM_HEADERS)
\ No newline at end of file
diff --git a/adm_local/cmake_files/Makefile.am b/adm_local/cmake_files/Makefile.am
index a903f3f45..1dbfb878b 100644
--- a/adm_local/cmake_files/Makefile.am
+++ b/adm_local/cmake_files/Makefile.am
@@ -23,11 +23,6 @@ SUBDIRS = deprecated
 
 dist_admlocal_cmake_DATA = \
 FindCAS.cmake \
-FindOPENGL.cmake \
-FindQT4.cmake \
 UseQT4EXT.cmake \
 FindQWT.cmake \
-FindSIPPYQT.cmake \
-FindVTK.cmake \
 FindGUI.cmake
-
-- 
2.39.2