CMakeLists.txt | 5 Makefile.am | 1 cmake/modules/FindQt3.cmake | 319 -------------------------------------------- 3 files changed, 325 deletions(-)
New commits: commit 8dc9c693abb0033247a338d0f7d1f3f7a57c1a55 Author: Albert Astals Cid <[email protected]> Date: Sun Jan 16 17:14:34 2011 +0000 Some more qt3 thigs i forgot to kill diff --git a/CMakeLists.txt b/CMakeLists.txt index ac84846..ee65cee 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -65,7 +65,6 @@ set(OPI_SUPPORT ON) set(TEXTOUT_WORD_LIST ON) # setting the minimum required versions for some components -set(QT3_MIN_VERSION "3.3.0") set(QT4_MIN_VERSION "4.4.0") set(CAIRO_VERSION "1.10.0") set(GLIB_REQUIRED "2.18") @@ -565,9 +564,6 @@ poppler_create_install_pkgconfig(poppler.pc lib${LIB_SUFFIX}/pkgconfig) if(ENABLE_SPLASH) poppler_create_install_pkgconfig(poppler-splash.pc lib${LIB_SUFFIX}/pkgconfig) endif(ENABLE_SPLASH) -if(QT3_FOUND) - poppler_create_install_pkgconfig(poppler-qt.pc lib${LIB_SUFFIX}/pkgconfig) -endif(QT3_FOUND) if(QT4_FOUND) poppler_create_install_pkgconfig(poppler-qt4.pc lib${LIB_SUFFIX}/pkgconfig) endif(QT4_FOUND) @@ -587,7 +583,6 @@ show_end_message("font configuration" ${font_configuration}) show_end_message_yesno("splash output" ENABLE_SPLASH) show_end_message_yesno("cairo output" CAIRO_FOUND) show_end_message_yesno("abiword output" ENABLE_ABIWORD) -show_end_message_yesno("qt wrapper" QT3_FOUND) show_end_message_yesno("qt4 wrapper" QT4_FOUND) show_end_message_yesno("glib wrapper" ENABLE_GLIB) show_end_message_yesno(" use GDK" POPPLER_WITH_GDK) diff --git a/Makefile.am b/Makefile.am index 2515def..768a93b 100644 --- a/Makefile.am +++ b/Makefile.am @@ -81,7 +81,6 @@ EXTRA_DIST += \ cmake/modules/FindGTK.cmake \ cmake/modules/FindIconv.cmake \ cmake/modules/FindLCMS.cmake \ - cmake/modules/FindQt3.cmake \ cmake/modules/FindQt4.cmake \ cmake/modules/GObjectIntrospectionMacros.cmake \ cmake/modules/MacroBoolTo01.cmake \ diff --git a/cmake/modules/FindQt3.cmake b/cmake/modules/FindQt3.cmake deleted file mode 100644 index 06ff940..0000000 --- a/cmake/modules/FindQt3.cmake +++ /dev/null @@ -1,319 +0,0 @@ -# - Locate Qt include paths and libraries -# This module defines: -# QT3_INCLUDE_DIR - where to find qt.h, etc. -# QT3_LIBRARIES - the libraries to link against to use Qt. -# QT3_DEFINITIONS - definitions to use when -# compiling code that uses Qt. -# QT3_FOUND - If false, don't try to use Qt. -# -# If you need the multithreaded version of Qt, set QT_MT_REQUIRED to TRUE -# -# Also defined, but not for general use are: -# QT3_MOC_EXECUTABLE, where to find the moc tool. -# QT3_UIC_EXECUTABLE, where to find the uic tool. -# QT3_QT_LIBRARY, where to find the Qt library. -# QT3_QTMAIN_LIBRARY, where to find the qtmain -# library. This is only required by Qt3 on Windows. - -# These are around for backwards compatibility -# they will be set -# QT_WRAP_CPP, set true if QT3_MOC_EXECUTABLE is found -# QT_WRAP_UI set true if QT3_UIC_EXECUTABLE is found - -FILE(GLOB GLOB_PATHS_BIN /usr/lib/qt-3*/bin/) -FIND_PATH(QT3_INCLUDE_DIR qt.h - "[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\3.2.1;InstallDir]/include/Qt" - "[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\3.2.0;InstallDir]/include/Qt" - "[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\3.1.0;InstallDir]/include/Qt" - $ENV{QTDIR}/include - ${GLOB_PATHS_BIN} - /usr/local/qt/include - /usr/lib/qt/include - /usr/lib/qt3/include - /usr/include/qt - /usr/share/qt3/include - C:/Progra~1/qt/include - /usr/include/qt3 - /usr/X11R6/include - ) - -# if qglobal.h is not in the qt_include_dir then set -# QT3_INCLUDE_DIR to NOTFOUND -IF(NOT EXISTS ${QT3_INCLUDE_DIR}/qglobal.h) - SET(QT3_INCLUDE_DIR QT3_INCLUDE_DIR-NOTFOUND CACHE PATH "path to qt3 include directory" FORCE) -ENDIF(NOT EXISTS ${QT3_INCLUDE_DIR}/qglobal.h) - -IF(QT3_INCLUDE_DIR) - #extract the version string from qglobal.h - FILE(READ ${QT3_INCLUDE_DIR}/qglobal.h QGLOBAL_H) - STRING(REGEX MATCH "#define[\t ]+QT_VERSION_STR[\t ]+\"([0-9]+.[0-9]+.[0-9]+)\"" QGLOBAL_H "${QGLOBAL_H}") - STRING(REGEX REPLACE ".*\"([0-9]+.[0-9]+.[0-9]+)\".*" "\\1" qt_version_str "${QGLOBAL_H}") - - # Under windows the qt library (MSVC) has the format qt-mtXYZ where XYZ is the - # version X.Y.Z, so we need to remove the dots from version - STRING(REGEX REPLACE "\\." "" qt_version_str_lib "${qt_version_str}") -ELSE(QT3_INCLUDE_DIR) -ENDIF(QT3_INCLUDE_DIR) - -FILE(GLOB GLOB_PATHS_LIB /usr/lib/qt-3*/lib/) -IF (QT_MT_REQUIRED) - FIND_LIBRARY(QT3_QT_LIBRARY - NAMES - qt-mt qt-mt${qt_version_str_lib} qt-mtnc${qt_version_str_lib} - qt-mtedu${qt_version_str_lib} qt-mt230nc qt-mtnc321 qt-mt3 - PATHS - "[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\3.2.1;InstallDir]/lib" - "[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\3.2.0;InstallDir]/lib" - "[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\3.1.0;InstallDir]/lib" - $ENV{QTDIR}/lib - ${GLOB_PATHS_LIB} - /usr/local/qt/lib - /usr/lib/qt/lib - /usr/lib/qt3/lib - /usr/lib/qt3/lib64 - /usr/share/qt3/lib - C:/Progra~1/qt/lib - /usr/X11R6/lib - ) - -ELSE (QT_MT_REQUIRED) - FIND_LIBRARY(QT3_QT_LIBRARY - NAMES - qt qt-${qt_version_str_lib} qt-edu${qt_version_str_lib} - qt-mt qt-mt${qt_version_str_lib} qt-mtnc${qt_version_str_lib} - qt-mtedu${qt_version_str_lib} qt-mt230nc qt-mtnc321 qt-mt3 - PATHS - "[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\3.2.1;InstallDir]/lib" - "[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\3.2.0;InstallDir]/lib" - "[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\3.1.0;InstallDir]/lib" - $ENV{QTDIR}/lib - ${GLOB_PATHS_LIB} - /usr/local/qt/lib - /usr/lib/qt/lib - /usr/lib/qt3/lib - /usr/lib/qt3/lib64 - /usr/share/qt3/lib - C:/Progra~1/qt/lib - /usr/X11R6/lib - ) -ENDIF (QT_MT_REQUIRED) - -IF(QT3_QT_LIBRARY) -ELSE(QT3_QT_LIBRARY) -ENDIF(QT3_QT_LIBRARY) - - -FIND_LIBRARY(QT_QASSISTANTCLIENT_LIBRARY - NAMES qassistantclient - PATHS - "[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\3.2.1;InstallDir]/lib" - "[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\3.2.0;InstallDir]/lib" - "[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\3.1.0;InstallDir]/lib" - $ENV{QTDIR}/lib - ${GLOB_PATHS_LIB} - /usr/local/qt/lib - /usr/lib/qt3/lib - /usr/lib/qt3/lib64 - /usr/share/qt3/lib - C:/Progra~1/qt/lib - /usr/X11R6/lib - ) - -# qt 3 should prefer QTDIR over the PATH -FIND_PROGRAM(QT3_MOC_EXECUTABLE - NAMES moc moc-qt3 - PATHS - $ENV{QTDIR}/bin - NO_DEFAULT_PATH -) - -FIND_PROGRAM(QT3_MOC_EXECUTABLE - NAMES moc moc-qt3 - PATHS - "[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\3.2.1;InstallDir]/include/Qt" - "[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\3.2.0;InstallDir]/include/Qt" - "[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\3.1.0;InstallDir]/include/Qt" - $ENV{QTDIR}/bin - ${GLOB_PATHS_BIN} - /usr/local/qt/bin - /usr/lib/qt/bin - /usr/lib/qt3/bin - /usr/share/qt3/bin - C:/Progra~1/qt/bin - /usr/X11R6/bin - ) - -IF(QT3_MOC_EXECUTABLE) - SET ( QT_WRAP_CPP "YES") -ELSE(QT3_MOC_EXECUTABLE) -ENDIF(QT3_MOC_EXECUTABLE) - -# qt 3 should prefer QTDIR over the PATH -FIND_PROGRAM(QT3_UIC_EXECUTABLE uic - PATHS - $ENV{QTDIR}/bin - NO_DEFAULT_PATH -) -FIND_PROGRAM(QT3_UIC_EXECUTABLE uic - "[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\3.2.1;InstallDir]/include/Qt" - "[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\3.2.0;InstallDir]/include/Qt" - "[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\3.1.0;InstallDir]/include/Qt" - $ENV{QTDIR}/bin - ${GLOB_PATHS_BIN} - /usr/local/qt/bin - /usr/lib/qt/bin - /usr/lib/qt3/bin - /usr/share/qt3/bin - C:/Progra~1/qt/bin - /usr/X11R6/bin - ) - -IF(QT3_UIC_EXECUTABLE) - SET ( QT_WRAP_UI "YES") -ELSE(QT3_UIC_EXECUTABLE) -ENDIF(QT3_UIC_EXECUTABLE) - -IF (WIN32) - FIND_LIBRARY(QT3_QTMAIN_LIBRARY qtmain - "[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\3.2.1;InstallDir]/lib" - "[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\3.2.0;InstallDir]/lib" - "[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\3.1.0;InstallDir]/lib" - "$ENV{ProgramFiles}/qt/lib" - $ENV{QTDIR}/lib "C:/Program Files/qt/lib" - DOC "This Library is only needed by and included with Qt3 on MSWindows. It should be NOTFOUND, undefined or IGNORE otherwise." - ) -ENDIF (WIN32) - - -IF (QT3_MIN_VERSION) - - STRING(REGEX REPLACE "([0-9]+)\\.[0-9]+\\.[0-9]+" "\\1" qt_major_vers "${qt_version_str}") - STRING(REGEX REPLACE "[0-9]+\\.([0-9]+)\\.[0-9]+" "\\1" qt_minor_vers "${qt_version_str}") - STRING(REGEX REPLACE "[0-9]+\\.[0-9]+\\.([0-9]+)" "\\1" qt_patch_vers "${qt_version_str}") - - #now parse the parts of the user given version string into variables - STRING(REGEX MATCH "^[0-9]+\\.[0-9]+\\.[0-9]+$" req_qt_major_vers "${QT3_MIN_VERSION}") - IF (NOT req_qt_major_vers) - MESSAGE( FATAL_ERROR "Invalid Qt version string given: \"${QT3_MIN_VERSION}\", expected e.g. \"3.1.5\"") - ENDIF (NOT req_qt_major_vers) - - STRING(REGEX REPLACE "([0-9]+)\\.[0-9]+\\.[0-9]+" "\\1" req_qt_major_vers "${QT3_MIN_VERSION}") - STRING(REGEX REPLACE "[0-9]+\\.([0-9])+\\.[0-9]+" "\\1" req_qt_minor_vers "${QT3_MIN_VERSION}") - STRING(REGEX REPLACE "[0-9]+\\.[0-9]+\\.([0-9]+)" "\\1" req_qt_patch_vers "${QT3_MIN_VERSION}") - - # req = "6.5.4", qt = "3.2.1" - - IF (req_qt_major_vers GREATER qt_major_vers) # (6 > 3) ? - MESSAGE( FATAL_ERROR "Qt major version not matched (required: ${QT3_MIN_VERSION}, found: ${qt_version_str})") # yes - ELSE (req_qt_major_vers GREATER qt_major_vers) # no - IF (req_qt_major_vers LESS qt_major_vers) # (6 < 3) ? - SET( QT_VERSION_BIG_ENOUGH "YES" ) # yes - ELSE (req_qt_major_vers LESS qt_major_vers) # ( 6==3) ? - IF (req_qt_minor_vers GREATER qt_minor_vers) # (5>2) ? - MESSAGE( FATAL_ERROR "Qt minor version not matched (required: ${QT3_MIN_VERSION}, found: ${qt_version_str})") # yes - ELSE (req_qt_minor_vers GREATER qt_minor_vers) # no - IF (req_qt_minor_vers LESS qt_minor_vers) # (5<2) ? - SET( QT_VERSION_BIG_ENOUGH "YES" ) # yes - ELSE (req_qt_minor_vers LESS qt_minor_vers) # (5==2) - IF (req_qt_patch_vers GREATER qt_patch_vers) # (4>1) ? - MESSAGE( FATAL_ERROR "Qt patch level not matched (required: ${QT3_MIN_VERSION}, found: ${qt_version_str})") # yes - ELSE (req_qt_patch_vers GREATER qt_patch_vers) # (4>1) ? - SET( QT_VERSION_BIG_ENOUGH "YES" ) # yes - ENDIF (req_qt_patch_vers GREATER qt_patch_vers) # (4>1) ? - ENDIF (req_qt_minor_vers LESS qt_minor_vers) - ENDIF (req_qt_minor_vers GREATER qt_minor_vers) - ENDIF (req_qt_major_vers LESS qt_major_vers) - ENDIF (req_qt_major_vers GREATER qt_major_vers) -ENDIF (QT3_MIN_VERSION) - -# if the include a library are found then we have it -IF(QT3_INCLUDE_DIR) - IF(QT3_QT_LIBRARY) - SET( QT3_FOUND "YES" ) - ENDIF(QT3_QT_LIBRARY) -ENDIF(QT3_INCLUDE_DIR) - -IF(QT3_FOUND) - SET( QT3_LIBRARIES ${QT3_LIBRARIES} ${QT3_QT_LIBRARY} ) - SET( QT3_DEFINITIONS "") - - IF (WIN32 AND NOT CYGWIN) - IF (QT3_QTMAIN_LIBRARY) - # for version 3 - SET (QT3_DEFINITIONS -DQT_DLL -DQT_THREAD_SUPPORT -DNO_DEBUG) - SET (QT3_LIBRARIES imm32.lib ${QT3_QT_LIBRARY} ${QT3_QTMAIN_LIBRARY} ) - SET (QT3_LIBRARIES ${QT3_LIBRARIES} winmm wsock32) - ELSE (QT3_QTMAIN_LIBRARY) - # for version 2 - SET (QT3_LIBRARIES imm32.lib ws2_32.lib ${QT3_QT_LIBRARY} ) - ENDIF (QT3_QTMAIN_LIBRARY) - ELSE (WIN32 AND NOT CYGWIN) - SET (QT3_LIBRARIES ${QT3_QT_LIBRARY} ) - - SET (QT3_DEFINITIONS -DQT_SHARED -DQT_NO_DEBUG) - IF(QT3_QT_LIBRARY MATCHES "qt-mt") - SET (QT3_DEFINITIONS ${QT3_DEFINITIONS} -DQT_THREAD_SUPPORT -D_REENTRANT) - ENDIF(QT3_QT_LIBRARY MATCHES "qt-mt") - - ENDIF (WIN32 AND NOT CYGWIN) - - IF (QT_QASSISTANTCLIENT_LIBRARY) - SET (QT3_LIBRARIES ${QT_QASSISTANTCLIENT_LIBRARY} ${QT3_LIBRARIES}) - ENDIF (QT_QASSISTANTCLIENT_LIBRARY) - - # Backwards compatibility for CMake1.4 and 1.2 - SET (QT_MOC_EXE ${QT3_MOC_EXECUTABLE} ) - SET (QT_UIC_EXE ${QT3_UIC_EXECUTABLE} ) - # for unix add X11 stuff - IF(UNIX) - FIND_PACKAGE(X11) - IF (X11_FOUND) - SET (QT3_LIBRARIES ${QT3_LIBRARIES} ${X11_LIBRARIES}) - ENDIF (X11_FOUND) - IF (CMAKE_DL_LIBS) - SET (QT3_LIBRARIES ${QT3_LIBRARIES} ${CMAKE_DL_LIBS}) - ENDIF (CMAKE_DL_LIBS) - ENDIF(UNIX) - IF(QT3_QT_LIBRARY MATCHES "qt-mt") - FIND_PACKAGE(Threads) - SET(QT3_LIBRARIES ${QT3_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT}) - ENDIF(QT3_QT_LIBRARY MATCHES "qt-mt") -ENDIF(QT3_FOUND) - -EXEC_PROGRAM(${QT3_MOC_EXECUTABLE} ARGS "-v" OUTPUT_VARIABLE QTVERSION_MOC) -EXEC_PROGRAM(${QT3_UIC_EXECUTABLE} ARGS "-version" OUTPUT_VARIABLE QTVERSION_UI) - -SET(_QT_UIC_VERSION_3 FALSE) -IF("${QTVERSION_UIC}" MATCHES ".* 3..*") - SET(_QT_UIC_VERSION_3 TRUE) -ENDIF("${QTVERSION_UIC}" MATCHES ".* 3..*") - -SET(_QT_MOC_VERSION_3 FALSE) -IF("${QTVERSION_MOC}" MATCHES ".* 3..*") - SET(_QT_MOC_VERSION_3 TRUE) -ENDIF("${QTVERSION_MOC}" MATCHES ".* 3..*") - -SET(QT_WRAP_CPP FALSE) -IF (QT3_MOC_EXECUTABLE) - IF(_QT_MOC_VERSION_3) - SET ( QT_WRAP_CPP TRUE) - ENDIF(_QT_MOC_VERSION_3) -ENDIF (QT3_MOC_EXECUTABLE) - -SET(QT_WRAP_UI FALSE) -IF (QT3_UIC_EXECUTABLE) - IF(_QT_UIC_VERSION_3) - SET ( QT_WRAP_UI TRUE) - ENDIF(_QT_UIC_VERSION_3) -ENDIF (QT3_UIC_EXECUTABLE) - -MARK_AS_ADVANCED( - QT3_INCLUDE_DIR - QT3_QT_LIBRARY - QT3_QTMAIN_LIBRARY - QT_QASSISTANTCLIENT_LIBRARY - QT3_UIC_EXECUTABLE - QT3_MOC_EXECUTABLE - QT_WRAP_CPP - QT_WRAP_UI - ) _______________________________________________ poppler mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/poppler
