- FindQt4.cmake2.6.diff - remove, no longer needed as original bug has been fixed since 2.6; - FindQt3.cmake.diff - refresh, add DEP-3 headers; - findmpeg2-addpath.diff - remove, bug fixed upstream (in other way); - kfreebsd-Platform.diff - refresh, add DEP-3 headers; - executables-dont-need-fpic.diff - refresh, app DEP-3 headers; - manpage_friendly_docs.diff - remove, merged upstream; - FindPerlLibs.cmake-perl-5.10.diff - remove, fixed upstream differently; - FindJNI.cmake-more-arches.diff - remove, was taken from upstream; - FindVTK.cmake-vtk-5.4.diff - remove, was taken from upstream.ci/unstable
Modestas Vainius
15 years ago
parent
ac9aeb918f
commit
b152287dce
@ -1,132 +0,0 @@
|
|||||||
From: Modestas Vainius <modestas@vainius.eu>
|
|
||||||
Subject: Arch independent FindJNI.cmake on Linux
|
|
||||||
Backport Modules/FindJNI.cmake from CMake 2.8 CVS. It supports most Linux
|
|
||||||
arches and is capable of finding Sun Java, OpenJDK, Kaffe and GCJ JVMs.
|
|
||||||
It also adds support for Debian specific "default-java" paths.
|
|
||||||
Bug: http://public.kitware.com/Bug/view.php?id=9611
|
|
||||||
Bug-Debian: http://bugs.debian.org/544674
|
|
||||||
|
|
||||||
--- a/Modules/FindJNI.cmake
|
|
||||||
+++ b/Modules/FindJNI.cmake
|
|
||||||
@@ -12,6 +12,53 @@
|
|
||||||
# JAVA_AWT_INCLUDE_PATH = the include path to jawt.h
|
|
||||||
#
|
|
||||||
|
|
||||||
+#=============================================================================
|
|
||||||
+# Copyright 2001-2009 Kitware, Inc.
|
|
||||||
+#
|
|
||||||
+# Distributed under the OSI-approved BSD License (the "License");
|
|
||||||
+# see accompanying file Copyright.txt for details.
|
|
||||||
+#
|
|
||||||
+# This software is distributed WITHOUT ANY WARRANTY; without even the
|
|
||||||
+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
|
|
||||||
+# See the License for more information.
|
|
||||||
+#=============================================================================
|
|
||||||
+# (To distributed this file outside of CMake, substitute the full
|
|
||||||
+# License text for the above reference.)
|
|
||||||
+
|
|
||||||
+# Expand {libarch} occurences to java_libarch subdirectory(-ies) and set ${_var}
|
|
||||||
+MACRO(java_append_library_directories _var)
|
|
||||||
+ # Determine java arch-specific library subdir
|
|
||||||
+ IF (CMAKE_SYSTEM_NAME MATCHES "Linux")
|
|
||||||
+ # Based on openjdk/jdk/make/common/shared/Platform.gmk as of 6b16
|
|
||||||
+ # and kaffe as of 1.1.8 which uses the first part of the
|
|
||||||
+ # GNU config.guess platform triplet.
|
|
||||||
+ IF(CMAKE_SYSTEM_PROCESSOR MATCHES "^i[3-9]86$")
|
|
||||||
+ SET(_java_libarch "i386")
|
|
||||||
+ ELSEIF(CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
|
|
||||||
+ SET(_java_libarch "amd64" "x86_64")
|
|
||||||
+ ELSEIF(CMAKE_SYSTEM_PROCESSOR MATCHES "^ppc")
|
|
||||||
+ SET(_java_libarch "ppc" "powerpc" "ppc64")
|
|
||||||
+ ELSEIF(CMAKE_SYSTEM_PROCESSOR MATCHES "^sparc")
|
|
||||||
+ SET(_java_libarch "sparc" "sparcv9")
|
|
||||||
+ ELSE(CMAKE_SYSTEM_PROCESSOR MATCHES "^i[3-9]86$")
|
|
||||||
+ SET(_java_libarch "${CMAKE_SYSTEM_PROCESSOR}")
|
|
||||||
+ ENDIF(CMAKE_SYSTEM_PROCESSOR MATCHES "^i[3-9]86$")
|
|
||||||
+ ELSE(CMAKE_SYSTEM_NAME MATCHES "Linux")
|
|
||||||
+ SET(_java_libarch "i386" "amd64" "ppc") # previous default
|
|
||||||
+ ENDIF(CMAKE_SYSTEM_NAME MATCHES "Linux")
|
|
||||||
+
|
|
||||||
+ FOREACH(_path ${ARGN})
|
|
||||||
+ IF(_path MATCHES "{libarch}")
|
|
||||||
+ FOREACH(_libarch ${_java_libarch})
|
|
||||||
+ STRING(REPLACE "{libarch}" "${_libarch}" _newpath "${_path}")
|
|
||||||
+ LIST(APPEND ${_var} "${_newpath}")
|
|
||||||
+ ENDFOREACH(_libarch)
|
|
||||||
+ ELSE(_path MATCHES "{libarch}")
|
|
||||||
+ LIST(APPEND ${_var} "${_path}")
|
|
||||||
+ ENDIF(_path MATCHES "{libarch}")
|
|
||||||
+ ENDFOREACH(_path)
|
|
||||||
+ENDMACRO(java_append_library_directories)
|
|
||||||
+
|
|
||||||
GET_FILENAME_COMPONENT(java_install_version
|
|
||||||
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit;CurrentVersion]" NAME)
|
|
||||||
|
|
||||||
@@ -19,29 +66,29 @@
|
|
||||||
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\1.4;JavaHome]/lib"
|
|
||||||
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\1.3;JavaHome]/lib"
|
|
||||||
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\${java_install_version};JavaHome]/lib"
|
|
||||||
- $ENV{JAVA_HOME}/jre/lib/i386
|
|
||||||
- $ENV{JAVA_HOME}/jre/lib/amd64
|
|
||||||
- $ENV{JAVA_HOME}/jre/lib/ppc
|
|
||||||
+ )
|
|
||||||
+JAVA_APPEND_LIBRARY_DIRECTORIES(JAVA_AWT_LIBRARY_DIRECTORIES
|
|
||||||
+ $ENV{JAVA_HOME}/jre/lib/{libarch}
|
|
||||||
+ $ENV{JAVA_HOME}/jre/lib
|
|
||||||
+ $ENV{JAVA_HOME}/lib
|
|
||||||
+ $ENV{JAVA_HOME}
|
|
||||||
/usr/lib
|
|
||||||
/usr/local/lib
|
|
||||||
/usr/lib/jvm/java/lib
|
|
||||||
- /usr/lib/java/jre/lib/i386
|
|
||||||
- /usr/local/lib/java/jre/lib/i386
|
|
||||||
- /usr/local/share/java/jre/lib/i386
|
|
||||||
- /usr/lib/j2sdk1.4-sun/jre/lib/i386
|
|
||||||
- /usr/lib/j2sdk1.5-sun/jre/lib/i386
|
|
||||||
- /opt/sun-jdk-1.5.0.04/jre/lib/amd64
|
|
||||||
- /usr/lib/jvm/java-6-sun-1.6.0.00/jre/lib/amd64
|
|
||||||
- /usr/lib/java/jre/lib/amd64
|
|
||||||
- /usr/local/lib/java/jre/lib/amd64
|
|
||||||
- /usr/local/share/java/jre/lib/amd64
|
|
||||||
- /usr/lib/j2sdk1.4-sun/jre/lib/amd64
|
|
||||||
- /usr/lib/j2sdk1.5-sun/jre/lib/amd64
|
|
||||||
- /usr/lib/java/jre/lib/ppc
|
|
||||||
- /usr/local/lib/java/jre/lib/ppc
|
|
||||||
- /usr/local/share/java/jre/lib/ppc
|
|
||||||
- /usr/lib/j2sdk1.4-sun/jre/lib/ppc
|
|
||||||
- /usr/lib/j2sdk1.5-sun/jre/lib/ppc
|
|
||||||
+ /usr/lib/java/jre/lib/{libarch}
|
|
||||||
+ /usr/local/lib/java/jre/lib/{libarch}
|
|
||||||
+ /usr/local/share/java/jre/lib/{libarch}
|
|
||||||
+ /usr/lib/j2sdk1.4-sun/jre/lib/{libarch}
|
|
||||||
+ /usr/lib/j2sdk1.5-sun/jre/lib/{libarch}
|
|
||||||
+ /opt/sun-jdk-1.5.0.04/jre/lib/{libarch}
|
|
||||||
+ /usr/lib/jvm/java-6-sun/jre/lib/{libarch}
|
|
||||||
+ /usr/lib/jvm/java-1.5.0-sun/jre/lib/{libarch}
|
|
||||||
+ /usr/lib/jvm/java-6-sun-1.6.0.00/jre/lib/{libarch} # can this one be removed according to #8821 ? Alex
|
|
||||||
+ /usr/lib/jvm/java-6-openjdk/jre/lib/{libarch}
|
|
||||||
+ # Debian specific paths for default JVM
|
|
||||||
+ /usr/lib/jvm/default-java/jre/lib/{libarch}
|
|
||||||
+ /usr/lib/jvm/default-java/jre/lib
|
|
||||||
+ /usr/lib/jvm/default-java/lib
|
|
||||||
)
|
|
||||||
|
|
||||||
SET(JAVA_JVM_LIBRARY_DIRECTORIES)
|
|
||||||
@@ -65,11 +112,16 @@
|
|
||||||
/usr/lib/java/include
|
|
||||||
/usr/local/lib/java/include
|
|
||||||
/usr/lib/jvm/java/include
|
|
||||||
- /usr/lib/jvm/java-6-sun-1.6.0.00/include
|
|
||||||
+ /usr/lib/jvm/java-6-sun/include
|
|
||||||
+ /usr/lib/jvm/java-1.5.0-sun/include
|
|
||||||
+ /usr/lib/jvm/java-6-sun-1.6.0.00/include # can this one be removed according to #8821 ? Alex
|
|
||||||
+ /usr/lib/jvm/java-6-openjdk/include
|
|
||||||
/usr/local/share/java/include
|
|
||||||
/usr/lib/j2sdk1.4-sun/include
|
|
||||||
/usr/lib/j2sdk1.5-sun/include
|
|
||||||
/opt/sun-jdk-1.5.0.04/include
|
|
||||||
+ # Debian specific path for default JVM
|
|
||||||
+ /usr/lib/jvm/default-java/include
|
|
||||||
)
|
|
||||||
|
|
||||||
FOREACH(JAVA_PROG "${JAVA_RUNTIME}" "${JAVA_COMPILE}" "${JAVA_ARCHIVE}")
|
|
||||||
@ -1,19 +0,0 @@
|
|||||||
--- a/Modules/FindPerlLibs.cmake
|
|
||||||
+++ b/Modules/FindPerlLibs.cmake
|
|
||||||
@@ -8,6 +8,7 @@
|
|
||||||
#
|
|
||||||
|
|
||||||
SET(PERL_POSSIBLE_INCLUDE_PATHS
|
|
||||||
+ /usr/lib/perl/5.10.0/CORE
|
|
||||||
/usr/lib/perl/5.8.3/CORE
|
|
||||||
/usr/lib/perl/5.8.2/CORE
|
|
||||||
/usr/lib/perl/5.8.1/CORE
|
|
||||||
@@ -48,7 +49,7 @@
|
|
||||||
ENDIF(PERL_EXECUTABLE)
|
|
||||||
|
|
||||||
FIND_LIBRARY(PERL_LIBRARY
|
|
||||||
- NAMES ${PERL_POSSIBLE_LIBRARY_NAME} perl5.8.0
|
|
||||||
+ NAMES ${PERL_POSSIBLE_LIBRARY_NAME} perl5.8.0 perl
|
|
||||||
PATHS ${PERL_POSSIBLE_LIB_PATHS}
|
|
||||||
)
|
|
||||||
|
|
||||||
@ -1,213 +0,0 @@
|
|||||||
--- a/Modules/FindQt4.cmake
|
|
||||||
+++ b/Modules/FindQt4.cmake
|
|
||||||
@@ -1357,199 +1357,6 @@
|
|
||||||
QT_QUERY_QMAKE(QMAKE_LIBS_OPENGL "QMAKE_LIBS_OPENGL")
|
|
||||||
SET (QT_QTOPENGL_LIB_DEPENDENCIES ${QT_QTOPENGL_LIB_DEPENDENCIES} ${QMAKE_LIBS_OPENGL})
|
|
||||||
|
|
||||||
- ## system png
|
|
||||||
- IF(QT_QCONFIG MATCHES "system-png")
|
|
||||||
- FIND_LIBRARY(QT_PNG_LIBRARY NAMES png)
|
|
||||||
- MARK_AS_ADVANCED(QT_PNG_LIBRARY)
|
|
||||||
- IF(QT_PNG_LIBRARY)
|
|
||||||
- SET(QT_QTGUI_LIB_DEPENDENCIES ${QT_QTGUI_LIB_DEPENDENCIES} ${QT_PNG_LIBRARY})
|
|
||||||
- ENDIF(QT_PNG_LIBRARY)
|
|
||||||
- ENDIF(QT_QCONFIG MATCHES "system-png")
|
|
||||||
-
|
|
||||||
- # for X11, get X11 library directory
|
|
||||||
- IF(Q_WS_X11)
|
|
||||||
- QT_QUERY_QMAKE(QMAKE_LIBDIR_X11 "QMAKE_LIBDIR_X11")
|
|
||||||
- ENDIF(Q_WS_X11)
|
|
||||||
-
|
|
||||||
- ## X11 SM
|
|
||||||
- IF(QT_QCONFIG MATCHES "x11sm")
|
|
||||||
- # ask qmake where the x11 libs are
|
|
||||||
- FIND_LIBRARY(QT_X11_SM_LIBRARY NAMES SM PATHS ${QMAKE_LIBDIR_X11})
|
|
||||||
- FIND_LIBRARY(QT_X11_ICE_LIBRARY NAMES ICE PATHS ${QMAKE_LIBDIR_X11})
|
|
||||||
- MARK_AS_ADVANCED(QT_X11_SM_LIBRARY)
|
|
||||||
- MARK_AS_ADVANCED(QT_X11_ICE_LIBRARY)
|
|
||||||
- IF(QT_X11_SM_LIBRARY AND QT_X11_ICE_LIBRARY)
|
|
||||||
- SET(QT_QTGUI_LIB_DEPENDENCIES ${QT_QTGUI_LIB_DEPENDENCIES} ${QT_X11_SM_LIBRARY} ${QT_X11_ICE_LIBRARY})
|
|
||||||
- ENDIF(QT_X11_SM_LIBRARY AND QT_X11_ICE_LIBRARY)
|
|
||||||
- ENDIF(QT_QCONFIG MATCHES "x11sm")
|
|
||||||
-
|
|
||||||
- ## Xi
|
|
||||||
- IF(QT_QCONFIG MATCHES "tablet")
|
|
||||||
- FIND_LIBRARY(QT_XI_LIBRARY NAMES Xi PATHS ${QMAKE_LIBDIR_X11})
|
|
||||||
- MARK_AS_ADVANCED(QT_XI_LIBRARY)
|
|
||||||
- IF(QT_XI_LIBRARY)
|
|
||||||
- SET(QT_QTGUI_LIB_DEPENDENCIES ${QT_QTGUI_LIB_DEPENDENCIES} ${QT_XI_LIBRARY})
|
|
||||||
- ENDIF(QT_XI_LIBRARY)
|
|
||||||
- ENDIF(QT_QCONFIG MATCHES "tablet")
|
|
||||||
-
|
|
||||||
- ## Xrender
|
|
||||||
- IF(QT_QCONFIG MATCHES "xrender")
|
|
||||||
- FIND_LIBRARY(QT_XRENDER_LIBRARY NAMES Xrender PATHS ${QMAKE_LIBDIR_X11})
|
|
||||||
- MARK_AS_ADVANCED(QT_XRENDER_LIBRARY)
|
|
||||||
- IF(QT_XRENDER_LIBRARY)
|
|
||||||
- SET(QT_QTGUI_LIB_DEPENDENCIES ${QT_QTGUI_LIB_DEPENDENCIES} ${QT_XRENDER_LIBRARY})
|
|
||||||
- ENDIF(QT_XRENDER_LIBRARY)
|
|
||||||
- ENDIF(QT_QCONFIG MATCHES "xrender")
|
|
||||||
-
|
|
||||||
- ## Xrandr
|
|
||||||
- IF(QT_QCONFIG MATCHES "xrandr")
|
|
||||||
- FIND_LIBRARY(QT_XRANDR_LIBRARY NAMES Xrandr PATHS ${QMAKE_LIBDIR_X11})
|
|
||||||
- MARK_AS_ADVANCED(QT_XRANDR_LIBRARY)
|
|
||||||
- IF(QT_XRANDR_LIBRARY)
|
|
||||||
- SET(QT_QTGUI_LIB_DEPENDENCIES ${QT_QTGUI_LIB_DEPENDENCIES} ${QT_XRANDR_LIBRARY})
|
|
||||||
- ENDIF(QT_XRANDR_LIBRARY)
|
|
||||||
- ENDIF(QT_QCONFIG MATCHES "xrandr")
|
|
||||||
-
|
|
||||||
- ## Xcursor
|
|
||||||
- IF(QT_QCONFIG MATCHES "xcursor")
|
|
||||||
- FIND_LIBRARY(QT_XCURSOR_LIBRARY NAMES Xcursor PATHS ${QMAKE_LIBDIR_X11})
|
|
||||||
- MARK_AS_ADVANCED(QT_XCURSOR_LIBRARY)
|
|
||||||
- IF(QT_XCURSOR_LIBRARY)
|
|
||||||
- SET(QT_QTGUI_LIB_DEPENDENCIES ${QT_QTGUI_LIB_DEPENDENCIES} ${QT_XCURSOR_LIBRARY})
|
|
||||||
- ENDIF(QT_XCURSOR_LIBRARY)
|
|
||||||
- ENDIF(QT_QCONFIG MATCHES "xcursor")
|
|
||||||
-
|
|
||||||
- ## Xinerama
|
|
||||||
- IF(QT_QCONFIG MATCHES "xinerama")
|
|
||||||
- FIND_LIBRARY(QT_XINERAMA_LIBRARY NAMES Xinerama PATHS ${QMAKE_LIBDIR_X11})
|
|
||||||
- MARK_AS_ADVANCED(QT_XINERAMA_LIBRARY)
|
|
||||||
- IF(QT_XINERAMA_LIBRARY)
|
|
||||||
- SET(QT_QTGUI_LIB_DEPENDENCIES ${QT_QTGUI_LIB_DEPENDENCIES} ${QT_XINERAMA_LIBRARY})
|
|
||||||
- ENDIF(QT_XINERAMA_LIBRARY)
|
|
||||||
- ENDIF(QT_QCONFIG MATCHES "xinerama")
|
|
||||||
-
|
|
||||||
- ## Xfixes
|
|
||||||
- IF(QT_QCONFIG MATCHES "xfixes")
|
|
||||||
- FIND_LIBRARY(QT_XFIXES_LIBRARY NAMES Xfixes PATHS ${QMAKE_LIBDIR_X11})
|
|
||||||
- MARK_AS_ADVANCED(QT_XFIXES_LIBRARY)
|
|
||||||
- IF(QT_XFIXES_LIBRARY)
|
|
||||||
- SET(QT_QTGUI_LIB_DEPENDENCIES ${QT_QTGUI_LIB_DEPENDENCIES} ${QT_XFIXES_LIBRARY})
|
|
||||||
- ENDIF(QT_XFIXES_LIBRARY)
|
|
||||||
- ENDIF(QT_QCONFIG MATCHES "xfixes")
|
|
||||||
-
|
|
||||||
- ## system-freetype
|
|
||||||
- IF(QT_QCONFIG MATCHES "system-freetype")
|
|
||||||
- FIND_LIBRARY(QT_FREETYPE_LIBRARY NAMES freetype)
|
|
||||||
- MARK_AS_ADVANCED(QT_FREETYPE_LIBRARY)
|
|
||||||
- IF(QT_FREETYPE_LIBRARY)
|
|
||||||
- SET(QT_QTGUI_LIB_DEPENDENCIES ${QT_QTGUI_LIB_DEPENDENCIES} ${QT_FREETYPE_LIBRARY})
|
|
||||||
- ENDIF(QT_FREETYPE_LIBRARY)
|
|
||||||
- ENDIF(QT_QCONFIG MATCHES "system-freetype")
|
|
||||||
-
|
|
||||||
- ## fontconfig
|
|
||||||
- IF(QT_QCONFIG MATCHES "fontconfig")
|
|
||||||
- FIND_LIBRARY(QT_FONTCONFIG_LIBRARY NAMES fontconfig)
|
|
||||||
- MARK_AS_ADVANCED(QT_FONTCONFIG_LIBRARY)
|
|
||||||
- IF(QT_FONTCONFIG_LIBRARY)
|
|
||||||
- SET(QT_QTGUI_LIB_DEPENDENCIES ${QT_QTGUI_LIB_DEPENDENCIES} ${QT_FONTCONFIG_LIBRARY})
|
|
||||||
- ENDIF(QT_FONTCONFIG_LIBRARY)
|
|
||||||
- ENDIF(QT_QCONFIG MATCHES "fontconfig")
|
|
||||||
-
|
|
||||||
- ## system-zlib
|
|
||||||
- IF(QT_QCONFIG MATCHES "system-zlib")
|
|
||||||
- FIND_LIBRARY(QT_ZLIB_LIBRARY NAMES z)
|
|
||||||
- MARK_AS_ADVANCED(QT_ZLIB_LIBRARY)
|
|
||||||
- IF(QT_ZLIB_LIBRARY)
|
|
||||||
- SET(QT_QTCORE_LIB_DEPENDENCIES ${QT_QTCORE_LIB_DEPENDENCIES} ${QT_ZLIB_LIBRARY})
|
|
||||||
- ENDIF(QT_ZLIB_LIBRARY)
|
|
||||||
- ENDIF(QT_QCONFIG MATCHES "system-zlib")
|
|
||||||
-
|
|
||||||
- ## openssl
|
|
||||||
- IF(QT_QCONFIG MATCHES "openssl" AND NOT Q_WS_WIN)
|
|
||||||
- FIND_PACKAGE(OpenSSL)
|
|
||||||
- IF(OPENSSL_LIBRARIES)
|
|
||||||
- SET(QT_QTNETWORK_LIB_DEPENDENCIES ${QT_QTNETWORK_LIB_DEPENDENCIES} ${OPENSSL_LIBRARIES})
|
|
||||||
- ENDIF(OPENSSL_LIBRARIES)
|
|
||||||
- ENDIF(QT_QCONFIG MATCHES "openssl" AND NOT Q_WS_WIN)
|
|
||||||
-
|
|
||||||
- ## dbus
|
|
||||||
- IF(QT_QCONFIG MATCHES "dbus")
|
|
||||||
-
|
|
||||||
- # if the dbus library isn't found, we'll assume its not required to build
|
|
||||||
- # shared Qt on Linux doesn't require it
|
|
||||||
- IF(NOT QT_DBUS_LIBRARY)
|
|
||||||
- EXECUTE_PROCESS(COMMAND pkg-config --libs-only-L dbus-1
|
|
||||||
- OUTPUT_VARIABLE _dbus_query_output
|
|
||||||
- RESULT_VARIABLE _dbus_result
|
|
||||||
- ERROR_VARIABLE _dbus_query_output )
|
|
||||||
-
|
|
||||||
- IF(_dbus_result MATCHES 0)
|
|
||||||
- STRING(REPLACE "-L" "" _dbus_query_output "${_dbus_query_output}")
|
|
||||||
- SEPARATE_ARGUMENTS(_dbus_query_output)
|
|
||||||
- ELSE(_dbus_result MATCHES 0)
|
|
||||||
- SET(_dbus_query_output)
|
|
||||||
- ENDIF(_dbus_result MATCHES 0)
|
|
||||||
-
|
|
||||||
- FIND_LIBRARY(QT_DBUS_LIBRARY NAMES dbus-1 PATHS ${_dbus_query_output} )
|
|
||||||
-
|
|
||||||
- IF(QT_DBUS_LIBRARY)
|
|
||||||
- SET(QT_QTDBUS_LIB_DEPENDENCIES ${QT_QTDBUS_LIB_DEPENDENCIES} ${QT_DBUS_LIBRARY})
|
|
||||||
- ENDIF(QT_DBUS_LIBRARY)
|
|
||||||
-
|
|
||||||
- MARK_AS_ADVANCED(QT_DBUS_LIBRARY)
|
|
||||||
- ENDIF(NOT QT_DBUS_LIBRARY)
|
|
||||||
-
|
|
||||||
- ENDIF(QT_QCONFIG MATCHES "dbus")
|
|
||||||
-
|
|
||||||
- ## glib
|
|
||||||
- IF(QT_QCONFIG MATCHES "glib")
|
|
||||||
-
|
|
||||||
- # if the glib libraries aren't found, we'll assume its not required to build
|
|
||||||
- # shared Qt on Linux doesn't require it
|
|
||||||
-
|
|
||||||
- # Qt 4.2.0+ uses glib-2.0
|
|
||||||
- IF(NOT QT_GLIB_LIBRARY OR NOT QT_GTHREAD_LIBRARY)
|
|
||||||
- EXECUTE_PROCESS(COMMAND pkg-config --libs-only-L glib-2.0 gthread-2.0
|
|
||||||
- OUTPUT_VARIABLE _glib_query_output
|
|
||||||
- RESULT_VARIABLE _glib_result
|
|
||||||
- ERROR_VARIABLE _glib_query_output )
|
|
||||||
-
|
|
||||||
- IF(_glib_result MATCHES 0)
|
|
||||||
- STRING(REPLACE "-L" "" _glib_query_output "${_glib_query_output}")
|
|
||||||
- SEPARATE_ARGUMENTS(_glib_query_output)
|
|
||||||
- ELSE(_glib_result MATCHES 0)
|
|
||||||
- SET(_glib_query_output)
|
|
||||||
- ENDIF(_glib_result MATCHES 0)
|
|
||||||
-
|
|
||||||
- FIND_LIBRARY(QT_GLIB_LIBRARY NAMES glib-2.0 PATHS ${_glib_query_output} )
|
|
||||||
- FIND_LIBRARY(QT_GTHREAD_LIBRARY NAMES gthread-2.0 PATHS ${_glib_query_output} )
|
|
||||||
-
|
|
||||||
- MARK_AS_ADVANCED(QT_GLIB_LIBRARY)
|
|
||||||
- MARK_AS_ADVANCED(QT_GTHREAD_LIBRARY)
|
|
||||||
- ENDIF(NOT QT_GLIB_LIBRARY OR NOT QT_GTHREAD_LIBRARY)
|
|
||||||
-
|
|
||||||
- IF(QT_GLIB_LIBRARY AND QT_GTHREAD_LIBRARY)
|
|
||||||
- SET(QT_QTCORE_LIB_DEPENDENCIES ${QT_QTCORE_LIB_DEPENDENCIES}
|
|
||||||
- ${QT_GTHREAD_LIBRARY} ${QT_GLIB_LIBRARY})
|
|
||||||
- ENDIF(QT_GLIB_LIBRARY AND QT_GTHREAD_LIBRARY)
|
|
||||||
-
|
|
||||||
- ENDIF(QT_QCONFIG MATCHES "glib")
|
|
||||||
-
|
|
||||||
- ## clock-monotonic, just see if we need to link with rt
|
|
||||||
- IF(QT_QCONFIG MATCHES "clock-monotonic")
|
|
||||||
- SET(CMAKE_REQUIRED_LIBRARIES_SAVE ${CMAKE_REQUIRED_LIBRARIES})
|
|
||||||
- SET(CMAKE_REQUIRED_LIBRARIES rt)
|
|
||||||
- CHECK_SYMBOL_EXISTS(_POSIX_TIMERS "unistd.h;time.h" QT_POSIX_TIMERS)
|
|
||||||
- SET(CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES_SAVE})
|
|
||||||
- IF(QT_POSIX_TIMERS)
|
|
||||||
- FIND_LIBRARY(QT_RT_LIBRARY NAMES rt)
|
|
||||||
- MARK_AS_ADVANCED(QT_RT_LIBRARY)
|
|
||||||
- IF(QT_RT_LIBRARY)
|
|
||||||
- SET(QT_QTCORE_LIB_DEPENDENCIES ${QT_QTCORE_LIB_DEPENDENCIES} ${QT_RT_LIBRARY})
|
|
||||||
- ENDIF(QT_RT_LIBRARY)
|
|
||||||
- ENDIF(QT_POSIX_TIMERS)
|
|
||||||
- ENDIF(QT_QCONFIG MATCHES "clock-monotonic")
|
|
||||||
-
|
|
||||||
IF(Q_WS_X11)
|
|
||||||
# X11 libraries Qt absolutely depends on
|
|
||||||
QT_QUERY_QMAKE(QT_LIBS_X11 "QMAKE_LIBS_X11")
|
|
||||||
@@ -1558,9 +1365,9 @@
|
|
||||||
STRING(REGEX REPLACE "-l" "" QT_X11_LIB "${QT_X11_LIB}")
|
|
||||||
SET(QT_TMP_STR "QT_X11_${QT_X11_LIB}_LIBRARY")
|
|
||||||
FIND_LIBRARY(${QT_TMP_STR} NAMES "${QT_X11_LIB}" PATHS ${QMAKE_LIBDIR_X11})
|
|
||||||
- MARK_AS_ADVANCED(${QT_TMP_STR})
|
|
||||||
IF(${QT_TMP_STR})
|
|
||||||
SET(QT_QTGUI_LIB_DEPENDENCIES ${QT_QTGUI_LIB_DEPENDENCIES} ${${QT_TMP_STR}})
|
|
||||||
+ MARK_AS_ADVANCED(${QT_TMP_STR})
|
|
||||||
ENDIF(${QT_TMP_STR})
|
|
||||||
ENDFOREACH(QT_X11_LIB)
|
|
||||||
|
|
||||||
@ -1,36 +0,0 @@
|
|||||||
Subject: Modules/FindJNI.cmake: support VTK 5.4
|
|
||||||
Backport Modules/FindJNI.cmake from CMake 2.8 CVS.
|
|
||||||
Origin: upstream, http://public.kitware.com/cgi-bin/viewcvs.cgi/Modules/FindVTK.cmake?root=CMake&r1=1.29&r2=1.31&view=patch
|
|
||||||
Bug: http://public.kitware.com/Bug/view.php?id=8804
|
|
||||||
Bug-Debian: http://bugs.debian.org/546030
|
|
||||||
|
|
||||||
--- a/Modules/FindVTK.cmake
|
|
||||||
+++ b/Modules/FindVTK.cmake
|
|
||||||
@@ -27,6 +27,19 @@
|
|
||||||
# instead.
|
|
||||||
#
|
|
||||||
|
|
||||||
+#=============================================================================
|
|
||||||
+# Copyright 2001-2009 Kitware, Inc.
|
|
||||||
+#
|
|
||||||
+# Distributed under the OSI-approved BSD License (the "License");
|
|
||||||
+# see accompanying file Copyright.txt for details.
|
|
||||||
+#
|
|
||||||
+# This software is distributed WITHOUT ANY WARRANTY; without even the
|
|
||||||
+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
|
|
||||||
+# See the License for more information.
|
|
||||||
+#=============================================================================
|
|
||||||
+# (To distributed this file outside of CMake, substitute the full
|
|
||||||
+# License text for the above reference.)
|
|
||||||
+
|
|
||||||
# Construct consitent error messages for use below.
|
|
||||||
SET(VTK_DIR_DESCRIPTION "directory containing VTKConfig.cmake. This is either the root of the build tree, or PREFIX/lib/vtk for an installation. For VTK 4.0, this is the location of UseVTK.cmake. This is either the root of the build tree or PREFIX/include/vtk for an installation.")
|
|
||||||
SET(VTK_DIR_MESSAGE "VTK not found. Set the VTK_DIR cmake cache entry to the ${VTK_DIR_DESCRIPTION}")
|
|
||||||
@@ -45,6 +58,7 @@
|
|
||||||
SET(VTK_DIR_SEARCH "")
|
|
||||||
FOREACH(dir ${VTK_DIR_SEARCH2})
|
|
||||||
SET(VTK_DIR_SEARCH ${VTK_DIR_SEARCH}
|
|
||||||
+ ${dir}/../lib/vtk-5.4
|
|
||||||
${dir}/../lib/vtk-5.2
|
|
||||||
${dir}/../lib/vtk-5.1
|
|
||||||
${dir}/../lib/vtk-5.0
|
|
||||||
@ -1,12 +0,0 @@
|
|||||||
--- cmake-2.6.0.orig/Modules/FindMPEG2.cmake
|
|
||||||
+++ cmake-2.6.0/Modules/FindMPEG2.cmake
|
|
||||||
@@ -8,6 +8,9 @@
|
|
||||||
# MPEG2_vo_LIBRARY, where to find the vo library.
|
|
||||||
|
|
||||||
FIND_PATH(MPEG2_INCLUDE_DIR mpeg2.h
|
|
||||||
+ /usr/include/mpeg2dec
|
|
||||||
+ /usr/local/include
|
|
||||||
+ /usr/include
|
|
||||||
/usr/local/livid
|
|
||||||
)
|
|
||||||
|
|
||||||
@ -1,31 +0,0 @@
|
|||||||
--- a/Modules/FindBoost.cmake
|
|
||||||
+++ b/Modules/FindBoost.cmake
|
|
||||||
@@ -66,7 +66,7 @@
|
|
||||||
#
|
|
||||||
# SET(Boost_ADDITIONAL_VERSIONS "0.99" "0.99.0" "1.78" "1.78.0")
|
|
||||||
#
|
|
||||||
-# ============================================================================
|
|
||||||
+# ===================================== ============= ========================
|
|
||||||
#
|
|
||||||
# Variables used by this module, they can change the default behaviour and
|
|
||||||
# need to be set before calling find_package:
|
|
||||||
@@ -147,7 +147,7 @@
|
|
||||||
# "component" (includes debug and optimized keywords
|
|
||||||
# when needed).
|
|
||||||
#
|
|
||||||
-# =====================================================================
|
|
||||||
+# ===================================== ============= =================
|
|
||||||
#
|
|
||||||
#
|
|
||||||
# Copyright (c) 2006-2008 Andreas Schneider <mail@cynapses.org>
|
|
||||||
--- a/Modules/FindRTI.cmake
|
|
||||||
+++ b/Modules/FindRTI.cmake
|
|
||||||
@@ -5,7 +5,7 @@
|
|
||||||
# RTI is a simulation infrastructure standartized by IEEE and SISO. It has a
|
|
||||||
# well defined C++ API that assures that simulation applications are
|
|
||||||
# independent on a particular RTI implementation.
|
|
||||||
-# http://en.wikipedia.org/wiki/Run-Time_Infrastructure_(simulation)
|
|
||||||
+# http://en.wikipedia.org/wiki/Run-Time_Infrastructure_(simulation)
|
|
||||||
#
|
|
||||||
# This code sets the following variables:
|
|
||||||
# RTI_INCLUDE_DIR = the directory where RTI includes file are found
|
|
||||||
Loading…
Reference in new issue