[Cmake-commits] [cmake-commits] hoffman committed CTest.cmake 1.10 1.10.2.1 FindKDE4.cmake 1.10 1.10.2.1 FindPackageHandleStandardArgs.cmake 1.4 1.4.2.1 FindPackageMessage.cmake NONE 1.1.2.2 FindQt4.cmake 1.96 1.96.2.1 FindX11.cmake 1.31 1.31.2.1 UseQt4.cmake 1.13 1.13.2.1 VTKCompatibility.cmake 1.10 1.10.2.1
cmake-commits at cmake.org
cmake-commits at cmake.org
Tue Mar 18 10:23:54 EDT 2008
Update of /cvsroot/CMake/CMake/Modules
In directory public:/mounts/ram/cvs-serv31008/Modules
Modified Files:
Tag: CMake-2-6
CTest.cmake FindKDE4.cmake FindPackageHandleStandardArgs.cmake
FindQt4.cmake FindX11.cmake UseQt4.cmake
VTKCompatibility.cmake
Added Files:
Tag: CMake-2-6
FindPackageMessage.cmake
Log Message:
ENH: move head to branch
Index: FindKDE4.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindKDE4.cmake,v
retrieving revision 1.10
retrieving revision 1.10.2.1
diff -C 2 -d -r1.10 -r1.10.2.1
*** FindKDE4.cmake 26 Aug 2007 07:29:13 -0000 1.10
--- FindKDE4.cmake 18 Mar 2008 14:23:51 -0000 1.10.2.1
***************
*** 12,38 ****
FILE(TO_CMAKE_PATH "$ENV{KDEDIRS}" _KDEDIRS)
# For KDE4 kde-config has been renamed to kde4-config
FIND_PROGRAM(KDE4_KDECONFIG_EXECUTABLE NAMES kde4-config
! PATH_SUFFIXES bin # the suffix is for the paths coming from KDEDIRS
PATHS
! ${CMAKE_INSTALL_PREFIX}/bin
${_KDEDIRS}
! /opt/kde4/bin
NO_DEFAULT_PATH
)
! FIND_PROGRAM(KDE4_KDECONFIG_EXECUTABLE NAMES kde4-config )
! IF (KDE4_KDECONFIG_EXECUTABLE)
# then ask kde4-config for the kde data dirs
EXECUTE_PROCESS(COMMAND "${KDE4_KDECONFIG_EXECUTABLE}" --path data OUTPUT_VARIABLE _data_DIR ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE)
-
FILE(TO_CMAKE_PATH "${_data_DIR}" _data_DIR)
-
# then check the data dirs for FindKDE4Internal.cmake
FIND_PATH(KDE4_DATA_DIR cmake/modules/FindKDE4Internal.cmake ${_data_DIR})
! # if it has been found...
! IF (KDE4_DATA_DIR)
SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${KDE4_DATA_DIR}/cmake/modules)
--- 12,58 ----
FILE(TO_CMAKE_PATH "$ENV{KDEDIRS}" _KDEDIRS)
+ # when cross compiling, searching kde4-config in order to run it later on
+ # doesn't make a lot of sense. We'll have to do something about this.
+ # Searching always in the target environment ? Then we get at least the correct one,
+ # still it can't be used to run it. Alex
+
# For KDE4 kde-config has been renamed to kde4-config
FIND_PROGRAM(KDE4_KDECONFIG_EXECUTABLE NAMES kde4-config
! # the suffix must be used since KDEDIRS can be a list of directories which don't have bin/ appended
! PATH_SUFFIXES bin
PATHS
! ${CMAKE_INSTALL_PREFIX}
${_KDEDIRS}
! /opt/kde4
NO_DEFAULT_PATH
+ ONLY_CMAKE_FIND_ROOT_PATH
)
! FIND_PROGRAM(KDE4_KDECONFIG_EXECUTABLE NAMES kde4-config ONLY_CMAKE_FIND_ROOT_PATH)
! IF (NOT KDE4_KDECONFIG_EXECUTABLE)
! IF (KDE4_FIND_REQUIRED)
! MESSAGE(FATAL_ERROR "ERROR: Could not find KDE4 kde4-config")
! ENDIF (KDE4_FIND_REQUIRED)
! ENDIF (NOT KDE4_KDECONFIG_EXECUTABLE)
!
!
! # when cross compiling, KDE4_DATA_DIR may be already preset
! IF(NOT KDE4_DATA_DIR)
! IF(CMAKE_CROSSCOMPILING)
! # when cross compiling, don't run kde4-config but use its location as install dir
! GET_FILENAME_COMPONENT(KDE4_DATA_DIR "${KDE4_KDECONFIG_EXECUTABLE}" PATH)
! GET_FILENAME_COMPONENT(KDE4_DATA_DIR "${KDE4_DATA_DIR}" PATH)
! ELSE(CMAKE_CROSSCOMPILING)
# then ask kde4-config for the kde data dirs
EXECUTE_PROCESS(COMMAND "${KDE4_KDECONFIG_EXECUTABLE}" --path data OUTPUT_VARIABLE _data_DIR ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE)
FILE(TO_CMAKE_PATH "${_data_DIR}" _data_DIR)
# then check the data dirs for FindKDE4Internal.cmake
FIND_PATH(KDE4_DATA_DIR cmake/modules/FindKDE4Internal.cmake ${_data_DIR})
+ ENDIF(CMAKE_CROSSCOMPILING)
+ ENDIF(NOT KDE4_DATA_DIR)
! # if it has been found...
! IF (KDE4_DATA_DIR)
SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${KDE4_DATA_DIR}/cmake/modules)
***************
*** 48,61 ****
# use FindKDE4Internal.cmake to do the rest
FIND_PACKAGE(KDE4Internal ${_req} ${_quiet})
! ELSE (KDE4_DATA_DIR)
IF (KDE4_FIND_REQUIRED)
MESSAGE(FATAL_ERROR "ERROR: cmake/modules/FindKDE4Internal.cmake not found in ${_data_DIR}")
ENDIF (KDE4_FIND_REQUIRED)
! ENDIF (KDE4_DATA_DIR)
!
! ELSE (KDE4_KDECONFIG_EXECUTABLE)
! IF (KDE4_FIND_REQUIRED)
! MESSAGE(FATAL_ERROR "ERROR: Could not find KDE4 kde4-config")
! ENDIF (KDE4_FIND_REQUIRED)
! ENDIF (KDE4_KDECONFIG_EXECUTABLE)
!
--- 68,74 ----
# use FindKDE4Internal.cmake to do the rest
FIND_PACKAGE(KDE4Internal ${_req} ${_quiet})
! ELSE (KDE4_DATA_DIR)
IF (KDE4_FIND_REQUIRED)
MESSAGE(FATAL_ERROR "ERROR: cmake/modules/FindKDE4Internal.cmake not found in ${_data_DIR}")
ENDIF (KDE4_FIND_REQUIRED)
! ENDIF (KDE4_DATA_DIR)
Index: UseQt4.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/UseQt4.cmake,v
retrieving revision 1.13
retrieving revision 1.13.2.1
diff -C 2 -d -r1.13 -r1.13.2.1
*** UseQt4.cmake 1 Feb 2008 17:02:19 -0000 1.13
--- UseQt4.cmake 18 Mar 2008 14:23:52 -0000 1.13.2.1
***************
*** 21,102 ****
ENDIF (QT_USE_QTMAIN)
! # Macro for setting up compile flags for Qt modules
! MACRO(QT_MODULE_SETUP module)
! IF (QT_QT${module}_FOUND)
! ADD_DEFINITIONS(-DQT_${module}_LIB)
! INCLUDE_DIRECTORIES(${QT_QT${module}_INCLUDE_DIR})
! SET(QT_LIBRARIES ${QT_LIBRARIES} ${QT_QT${module}_LIBRARY} ${QT_${module}_LIB_DEPENDENCIES})
! ELSE (QT_QT${module}_FOUND)
! MESSAGE("Qt ${module} library not found.")
! ENDIF (QT_QT${module}_FOUND)
! ENDMACRO(QT_MODULE_SETUP)
!
! # Qt modules (in order of dependence)
IF (QT_USE_QT3SUPPORT)
- QT_MODULE_SETUP(3SUPPORT)
ADD_DEFINITIONS(-DQT3_SUPPORT)
ENDIF (QT_USE_QT3SUPPORT)
! IF (QT_USE_QTOPENGL)
! QT_MODULE_SETUP(OPENGL)
! ENDIF (QT_USE_QTOPENGL)
!
! IF (QT_USE_QTASSISTANT)
! QT_MODULE_SETUP(ASSISTANT)
! ENDIF (QT_USE_QTASSISTANT)
!
! IF (QT_USE_QTDESIGNER)
! QT_MODULE_SETUP(DESIGNER)
! ENDIF (QT_USE_QTDESIGNER)
!
! IF (QT_USE_QTMOTIF)
! QT_MODULE_SETUP(MOTIF)
! ENDIF (QT_USE_QTMOTIF)
!
! IF (QT_USE_QTNSPLUGIN)
! QT_MODULE_SETUP(NSPLUGIN)
! ENDIF (QT_USE_QTNSPLUGIN)
!
! IF (QT_USE_QTSCRIPT)
! QT_MODULE_SETUP(SCRIPT)
! ENDIF (QT_USE_QTSCRIPT)
!
! IF (QT_USE_QTSVG)
! QT_MODULE_SETUP(SVG)
! ENDIF (QT_USE_QTSVG)
!
! IF (QT_USE_QTUITOOLS)
! QT_MODULE_SETUP(UITOOLS)
! ENDIF (QT_USE_QTUITOOLS)
!
! IF (NOT QT_DONT_USE_QTGUI)
! QT_MODULE_SETUP(GUI)
! ENDIF (NOT QT_DONT_USE_QTGUI)
!
! IF (QT_USE_QTTEST)
! QT_MODULE_SETUP(TEST)
! ENDIF (QT_USE_QTTEST)
!
! IF (QT_USE_QTXML)
! QT_MODULE_SETUP(XML)
! ENDIF (QT_USE_QTXML)
!
! IF (QT_USE_QTSQL)
! QT_MODULE_SETUP(SQL)
! ENDIF (QT_USE_QTSQL)
!
! IF (QT_USE_QTNETWORK)
! QT_MODULE_SETUP(NETWORK)
! ENDIF (QT_USE_QTNETWORK)
!
! IF (QT_USE_QTDBUS)
! QT_MODULE_SETUP(DBUS)
! ENDIF (QT_USE_QTDBUS)
! IF (NOT QT_DONT_USE_QTCORE)
! QT_MODULE_SETUP(CORE)
! ENDIF (NOT QT_DONT_USE_QTCORE)
--- 21,70 ----
ENDIF (QT_USE_QTMAIN)
! IF(QT_DONT_USE_QTGUI)
! SET(QT_USE_QTGUI 0)
! ELSE(QT_DONT_USE_QTGUI)
! SET(QT_USE_QTGUI 1)
! ENDIF(QT_DONT_USE_QTGUI)
! IF(QT_DONT_USE_QTCORE)
! SET(QT_USE_QTCORE 0)
! ELSE(QT_DONT_USE_QTCORE)
! SET(QT_USE_QTCORE 1)
! ENDIF(QT_DONT_USE_QTCORE)
IF (QT_USE_QT3SUPPORT)
ADD_DEFINITIONS(-DQT3_SUPPORT)
ENDIF (QT_USE_QT3SUPPORT)
! # list dependent modules, so their modules are automatically on
! SET(QT_QT3SUPPORT_MODULE_DEPENDS QTGUI QTSQL QTXML QTNETWORK QTCORE)
! SET(QT_QTSVG_MODULE_DEPENDS QTGUI QTXML QTCORE)
! SET(QT_QTUITOOLS_MODULE_DEPENDS QTGUI QTXML QTCORE)
! SET(QT_QTHELP_MODULE_DEPENDS QTGUI QTSQL QTXML QTCORE)
! SET(QT_PHONON_MODULE_DEPENDS QTGUI QTDBUS QTCORE)
! SET(QT_QTDBUS_MODULE_DEPENDS QTXML QTCORE)
! SET(QT_QTXMLPATTERNS_MODULE_DEPENDS QTNETWORK QTCORE)
! # Qt modules (in order of dependence)
! FOREACH(module QT3SUPPORT QTOPENGL QTASSISTANT QTDESIGNER QTMOTIF QTNSPLUGIN
! QTSCRIPT QTSVG QTUITOOLS QTHELP QTWEBKIT PHONON QTGUI QTTEST
! QTDBUS QTXML QTSQL QTXMLPATTERNS QTNETWORK QTCORE)
+ IF (QT_USE_${module})
+ IF (QT_${module}_FOUND)
+ IF(QT_USE_${module})
+ STRING(REPLACE "QT" "" qt_module_def "${module}")
+ ADD_DEFINITIONS(-DQT_${qt_module_def}_LIB)
+ INCLUDE_DIRECTORIES(${QT_${module}_INCLUDE_DIR})
+ ENDIF(QT_USE_${module})
+ SET(QT_LIBRARIES ${QT_LIBRARIES} ${QT_${module}_LIBRARY} ${QT_${module}_LIB_DEPENDENCIES})
+ FOREACH(depend_module ${QT_${module}_MODULE_DEPENDS})
+ SET(QT_USE_${depend_module} 1)
+ ENDFOREACH(depend_module ${QT_${module}_MODULE_DEPENDS})
+ ELSE (QT_${module}_FOUND)
+ MESSAGE("Qt ${module} library not found.")
+ ENDIF (QT_${module}_FOUND)
+ ENDIF (QT_USE_${module})
+
+ ENDFOREACH(module)
--- NEW FILE: FindPackageMessage.cmake ---
# FIND_PACKAGE_MESSAGE(<name> "message for user" "find result details")
#
# This macro is intended to be used in FindXXX.cmake modules files.
# It will print a message once for each unique find result.
# This is useful for telling the user where a package was found.
# The first argument specifies the name (XXX) of the package.
# The second argument specifies the message to display.
# The third argument lists details about the find result so that
# if they change the message will be displayed again.
# The macro also obeys the QUIET argument to the find_package command.
#
# Example:
#
# IF(X11_FOUND)
# FIND_PACKAGE_MESSAGE(X11 "Found X11: ${X11_X11_LIB}"
# "[${X11_X11_LIB}][${X11_INCLUDE_DIR}]")
# ELSE(X11_FOUND)
# ...
# ENDIF(X11_FOUND)
FUNCTION(FIND_PACKAGE_MESSAGE pkg msg details)
# Avoid printing a message repeatedly for the same find result.
IF(NOT ${pkg}_FIND_QUIETLY)
SET(DETAILS_VAR FIND_PACKAGE_MESSAGE_DETAILS_${pkg})
IF(NOT "${details}" STREQUAL "${${DETAILS_VAR}}")
# The message has not yet been printed.
MESSAGE(STATUS "${msg}")
# Save the find details in the cache to avoid printing the same
# message again.
SET("${DETAILS_VAR}" "${details}"
CACHE INTERNAL "Details about finding ${pkg}")
ENDIF(NOT "${details}" STREQUAL "${${DETAILS_VAR}}")
ENDIF(NOT ${pkg}_FIND_QUIETLY)
ENDFUNCTION(FIND_PACKAGE_MESSAGE)
Index: FindQt4.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindQt4.cmake,v
retrieving revision 1.96
retrieving revision 1.96.2.1
diff -C 2 -d -r1.96 -r1.96.2.1
*** FindQt4.cmake 13 Mar 2008 19:29:28 -0000 1.96
--- FindQt4.cmake 18 Mar 2008 14:23:52 -0000 1.96.2.1
***************
*** 29,32 ****
--- 29,33 ----
# QT_USE_QTWEBKIT
# QT_USE_QTXMLPATTERNS
+ # QT_USE_PHONON
#
# All the libraries required are stored in a variable called QT_LIBRARIES.
***************
*** 121,124 ****
--- 122,126 ----
# QT_QTWEBKIT_FOUND True if QtWebKit was found.
# QT_QTXMLPATTERNS_FOUND True if QtXmlPatterns was found.
+ # QT_PHONON_FOUND True if phonon was found.
#
# QT_DEFINITIONS Definitions to use when compiling code that uses Qt.
***************
*** 152,155 ****
--- 154,158 ----
# QT_QTWEBKIT_INCLUDE_DIR Path to "include/QtWebKit"
# QT_QTXMLPATTERNS_INCLUDE_DIR Path to "include/QtXmlPatterns"
+ # QT_PHONON_INCLUDE_DIR Path to "include/phonon"
#
# QT_LIBRARY_DIR Path to "lib" of Qt4
***************
*** 183,186 ****
--- 186,190 ----
# QT_QTWEBKIT_LIBRARY The QtWebKit library
# QT_QTXMLPATTERNS_LIBRARY The QtXmlPatterns library
+ # QT_PHONON_LIBRARY The phonon library
#
# also defined, but NOT for general use are
***************
*** 589,593 ****
# Set QT_QTASSISTANTCLIENT_INCLUDE_DIR
! FIND_PATH(QT_QTASSISTANTCLIENT_INCLUDE_DIR QtAssistantClient
PATHS
${QT_INCLUDE_DIR}/QtAssistant
--- 593,597 ----
# Set QT_QTASSISTANTCLIENT_INCLUDE_DIR
! FIND_PATH(QT_QTASSISTANTCLIENT_INCLUDE_DIR QAssistantClient
PATHS
${QT_INCLUDE_DIR}/QtAssistant
***************
*** 619,622 ****
--- 623,633 ----
NO_DEFAULT_PATH
)
+
+ # Set QT_PHONON_INCLUDE_DIR
+ FIND_PATH(QT_PHONON_INCLUDE_DIR phonon
+ PATHS
+ ${QT_INCLUDE_DIR}/phonon
+ NO_DEFAULT_PATH
+ )
# Make variables changeble to the advanced user
***************
*** 723,726 ****
--- 734,739 ----
FIND_LIBRARY(QT_QTHELP_LIBRARY_RELEASE NAMES QtHelp QtHelp4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
FIND_LIBRARY(QT_QTHELP_LIBRARY_DEBUG NAMES QtHelp_debug QtHelpd4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
+ FIND_LIBRARY(QT_QTCLUCENE_LIBRARY_RELEASE NAMES QtCLucene QtCLucene4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
+ FIND_LIBRARY(QT_QTCLUCENE_LIBRARY_DEBUG NAMES QtCLucene_debug QtCLucened4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
# Set QT_QTWEBKIT_LIBRARY
***************
*** 731,734 ****
--- 744,751 ----
FIND_LIBRARY(QT_QTXMLPATTERNS_LIBRARY_RELEASE NAMES QtXmlPatterns QtXmlPatterns4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
FIND_LIBRARY(QT_QTXMLPATTERNS_LIBRARY_DEBUG NAMES QtXmlPatterns_debug QtXmlPatternsd4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
+
+ # Set QT_PHONON_LIBRARY
+ FIND_LIBRARY(QT_PHONON_LIBRARY_RELEASE NAMES phonon phonon4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
+ FIND_LIBRARY(QT_PHONON_LIBRARY_DEBUG NAMES phonon_debug phonond4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
############################################
***************
*** 808,811 ****
--- 825,830 ----
_QT4_ADJUST_LIB_VARS(QTWEBKIT)
_QT4_ADJUST_LIB_VARS(QTXMLPATTERNS)
+ _QT4_ADJUST_LIB_VARS(PHONON)
+ _QT4_ADJUST_LIB_VARS(QTCLUCENE)
# platform dependent libraries
***************
*** 1214,1220 ****
IF( QT_LIBRARY_DIR AND QT_INCLUDE_DIR AND QT_MOC_EXECUTABLE AND QT_UIC_EXECUTABLE AND QT_RCC_EXECUTABLE)
SET( QT4_FOUND "YES" )
! IF( NOT Qt4_FIND_QUIETLY)
! MESSAGE(STATUS "Found Qt-Version ${QTVERSION}")
! ENDIF( NOT Qt4_FIND_QUIETLY)
ELSE( QT_LIBRARY_DIR AND QT_INCLUDE_DIR AND QT_MOC_EXECUTABLE AND QT_UIC_EXECUTABLE AND QT_RCC_EXECUTABLE)
SET( QT4_FOUND "NO")
--- 1233,1239 ----
IF( QT_LIBRARY_DIR AND QT_INCLUDE_DIR AND QT_MOC_EXECUTABLE AND QT_UIC_EXECUTABLE AND QT_RCC_EXECUTABLE)
SET( QT4_FOUND "YES" )
! INCLUDE(FindPackageMessage)
! FIND_PACKAGE_MESSAGE(Qt4 "Found Qt-Version ${QTVERSION}"
! "[${QT_LIBRARY_DIR}][${QT_INCLUDE_DIR}][${QT_MOC_EXECUTABLE}][${QT_UIC_EXECUTABLE}][${QT_RCC_EXECUTABLE}]")
ELSE( QT_LIBRARY_DIR AND QT_INCLUDE_DIR AND QT_MOC_EXECUTABLE AND QT_UIC_EXECUTABLE AND QT_RCC_EXECUTABLE)
SET( QT4_FOUND "NO")
***************
*** 1249,1254 ****
###############################################
! SET(QT_GUI_LIB_DEPENDENCIES "")
! SET(QT_CORE_LIB_DEPENDENCIES "")
# build using shared Qt needs -DQT_DLL
--- 1268,1276 ----
###############################################
! SET(QT_QTGUI_LIB_DEPENDENCIES "")
! SET(QT_QTCORE_LIB_DEPENDENCIES "")
! SET(QT_QTNETWORK_LIB_DEPENDENCIES "")
! SET(QT_QTOPENGL_LIB_DEPENDENCIES "")
! SET(QT_QTHELP_LIB_DEPENDENCIES ${QT_QTCLUCENE_LIBRARY})
# build using shared Qt needs -DQT_DLL
***************
*** 1259,1266 ****
ENDIF(NOT QT_CONFIG MATCHES "static")
## system png
IF(QT_QCONFIG MATCHES "system-png")
FIND_LIBRARY(QT_PNG_LIBRARY NAMES png)
! SET(QT_GUI_LIB_DEPENDENCIES ${QT_GUI_LIB_DEPENDENCIES} ${QT_PNG_LIBRARY})
MARK_AS_ADVANCED(QT_PNG_LIBRARY)
ENDIF(QT_QCONFIG MATCHES "system-png")
--- 1281,1292 ----
ENDIF(NOT QT_CONFIG MATCHES "static")
+ # QtOpenGL dependencies
+ 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)
! SET(QT_QTGUI_LIB_DEPENDENCIES ${QT_QTGUI_LIB_DEPENDENCIES} ${QT_PNG_LIBRARY})
MARK_AS_ADVANCED(QT_PNG_LIBRARY)
ENDIF(QT_QCONFIG MATCHES "system-png")
***************
*** 1276,1280 ****
FIND_LIBRARY(QT_X11_SM_LIBRARY NAMES SM PATHS ${QMAKE_LIBDIR_X11})
FIND_LIBRARY(QT_X11_ICE_LIBRARY NAMES ICE PATHS ${QMAKE_LIBDIR_X11})
! SET(QT_GUI_LIB_DEPENDENCIES ${QT_GUI_LIB_DEPENDENCIES} ${QT_X11_SM_LIBRARY} ${QT_X11_ICE_LIBRARY})
MARK_AS_ADVANCED(QT_X11_SM_LIBRARY)
MARK_AS_ADVANCED(QT_X11_ICE_LIBRARY)
--- 1302,1306 ----
FIND_LIBRARY(QT_X11_SM_LIBRARY NAMES SM PATHS ${QMAKE_LIBDIR_X11})
FIND_LIBRARY(QT_X11_ICE_LIBRARY NAMES ICE PATHS ${QMAKE_LIBDIR_X11})
! SET(QT_QTGUI_LIB_DEPENDENCIES ${QT_QTGUI_LIB_DEPENDENCIES} ${QT_X11_SM_LIBRARY} ${QT_X11_ICE_LIBRARY})
MARK_AS_ADVANCED(QT_X11_SM_LIBRARY)
MARK_AS_ADVANCED(QT_X11_ICE_LIBRARY)
***************
*** 1284,1288 ****
IF(QT_QCONFIG MATCHES "tablet")
FIND_LIBRARY(QT_XI_LIBRARY NAMES Xi PATHS ${QMAKE_LIBDIR_X11})
! SET(QT_GUI_LIB_DEPENDENCIES ${QT_GUI_LIB_DEPENDENCIES} ${QT_XI_LIBRARY})
MARK_AS_ADVANCED(QT_XI_LIBRARY)
ENDIF(QT_QCONFIG MATCHES "tablet")
--- 1310,1314 ----
IF(QT_QCONFIG MATCHES "tablet")
FIND_LIBRARY(QT_XI_LIBRARY NAMES Xi PATHS ${QMAKE_LIBDIR_X11})
! SET(QT_QTGUI_LIB_DEPENDENCIES ${QT_QTGUI_LIB_DEPENDENCIES} ${QT_XI_LIBRARY})
MARK_AS_ADVANCED(QT_XI_LIBRARY)
ENDIF(QT_QCONFIG MATCHES "tablet")
***************
*** 1291,1295 ****
IF(QT_QCONFIG MATCHES "xrender")
FIND_LIBRARY(QT_XRENDER_LIBRARY NAMES Xrender PATHS ${QMAKE_LIBDIR_X11})
! SET(QT_GUI_LIB_DEPENDENCIES ${QT_GUI_LIB_DEPENDENCIES} ${QT_XRENDER_LIBRARY})
MARK_AS_ADVANCED(QT_XRENDER_LIBRARY)
ENDIF(QT_QCONFIG MATCHES "xrender")
--- 1317,1321 ----
IF(QT_QCONFIG MATCHES "xrender")
FIND_LIBRARY(QT_XRENDER_LIBRARY NAMES Xrender PATHS ${QMAKE_LIBDIR_X11})
! SET(QT_QTGUI_LIB_DEPENDENCIES ${QT_QTGUI_LIB_DEPENDENCIES} ${QT_XRENDER_LIBRARY})
MARK_AS_ADVANCED(QT_XRENDER_LIBRARY)
ENDIF(QT_QCONFIG MATCHES "xrender")
***************
*** 1298,1302 ****
IF(QT_QCONFIG MATCHES "xrandr")
FIND_LIBRARY(QT_XRANDR_LIBRARY NAMES Xrandr PATHS ${QMAKE_LIBDIR_X11})
! SET(QT_GUI_LIB_DEPENDENCIES ${QT_GUI_LIB_DEPENDENCIES} ${QT_XRANDR_LIBRARY})
MARK_AS_ADVANCED(QT_XRANDR_LIBRARY)
ENDIF(QT_QCONFIG MATCHES "xrandr")
--- 1324,1328 ----
IF(QT_QCONFIG MATCHES "xrandr")
FIND_LIBRARY(QT_XRANDR_LIBRARY NAMES Xrandr PATHS ${QMAKE_LIBDIR_X11})
! SET(QT_QTGUI_LIB_DEPENDENCIES ${QT_QTGUI_LIB_DEPENDENCIES} ${QT_XRANDR_LIBRARY})
MARK_AS_ADVANCED(QT_XRANDR_LIBRARY)
ENDIF(QT_QCONFIG MATCHES "xrandr")
***************
*** 1305,1309 ****
IF(QT_QCONFIG MATCHES "xcursor")
FIND_LIBRARY(QT_XCURSOR_LIBRARY NAMES Xcursor PATHS ${QMAKE_LIBDIR_X11})
! SET(QT_GUI_LIB_DEPENDENCIES ${QT_GUI_LIB_DEPENDENCIES} ${QT_XCURSOR_LIBRARY})
MARK_AS_ADVANCED(QT_XCURSOR_LIBRARY)
ENDIF(QT_QCONFIG MATCHES "xcursor")
--- 1331,1335 ----
IF(QT_QCONFIG MATCHES "xcursor")
FIND_LIBRARY(QT_XCURSOR_LIBRARY NAMES Xcursor PATHS ${QMAKE_LIBDIR_X11})
! SET(QT_QTGUI_LIB_DEPENDENCIES ${QT_QTGUI_LIB_DEPENDENCIES} ${QT_XCURSOR_LIBRARY})
MARK_AS_ADVANCED(QT_XCURSOR_LIBRARY)
ENDIF(QT_QCONFIG MATCHES "xcursor")
***************
*** 1312,1316 ****
IF(QT_QCONFIG MATCHES "xinerama")
FIND_LIBRARY(QT_XINERAMA_LIBRARY NAMES Xinerama PATHS ${QMAKE_LIBDIR_X11})
! SET(QT_GUI_LIB_DEPENDENCIES ${QT_GUI_LIB_DEPENDENCIES} ${QT_XINERAMA_LIBRARY})
MARK_AS_ADVANCED(QT_XINERAMA_LIBRARY)
ENDIF(QT_QCONFIG MATCHES "xinerama")
--- 1338,1342 ----
IF(QT_QCONFIG MATCHES "xinerama")
FIND_LIBRARY(QT_XINERAMA_LIBRARY NAMES Xinerama PATHS ${QMAKE_LIBDIR_X11})
! SET(QT_QTGUI_LIB_DEPENDENCIES ${QT_QTGUI_LIB_DEPENDENCIES} ${QT_XINERAMA_LIBRARY})
MARK_AS_ADVANCED(QT_XINERAMA_LIBRARY)
ENDIF(QT_QCONFIG MATCHES "xinerama")
***************
*** 1319,1323 ****
IF(QT_QCONFIG MATCHES "xfixes")
FIND_LIBRARY(QT_XFIXES_LIBRARY NAMES Xfixes PATHS ${QMAKE_LIBDIR_X11})
! SET(QT_GUI_LIB_DEPENDENCIES ${QT_GUI_LIB_DEPENDENCIES} ${QT_XFIXES_LIBRARY})
MARK_AS_ADVANCED(QT_XFIXES_LIBRARY)
ENDIF(QT_QCONFIG MATCHES "xfixes")
--- 1345,1349 ----
IF(QT_QCONFIG MATCHES "xfixes")
FIND_LIBRARY(QT_XFIXES_LIBRARY NAMES Xfixes PATHS ${QMAKE_LIBDIR_X11})
! SET(QT_QTGUI_LIB_DEPENDENCIES ${QT_QTGUI_LIB_DEPENDENCIES} ${QT_XFIXES_LIBRARY})
MARK_AS_ADVANCED(QT_XFIXES_LIBRARY)
ENDIF(QT_QCONFIG MATCHES "xfixes")
***************
*** 1326,1330 ****
IF(QT_QCONFIG MATCHES "system-freetype")
FIND_LIBRARY(QT_FREETYPE_LIBRARY NAMES freetype)
! SET(QT_GUI_LIB_DEPENDENCIES ${QT_GUI_LIB_DEPENDENCIES} ${QT_FREETYPE_LIBRARY})
MARK_AS_ADVANCED(QT_FREETYPE_LIBRARY)
ENDIF(QT_QCONFIG MATCHES "system-freetype")
--- 1352,1356 ----
IF(QT_QCONFIG MATCHES "system-freetype")
FIND_LIBRARY(QT_FREETYPE_LIBRARY NAMES freetype)
! SET(QT_QTGUI_LIB_DEPENDENCIES ${QT_QTGUI_LIB_DEPENDENCIES} ${QT_FREETYPE_LIBRARY})
MARK_AS_ADVANCED(QT_FREETYPE_LIBRARY)
ENDIF(QT_QCONFIG MATCHES "system-freetype")
***************
*** 1333,1337 ****
IF(QT_QCONFIG MATCHES "fontconfig")
FIND_LIBRARY(QT_FONTCONFIG_LIBRARY NAMES fontconfig)
! SET(QT_GUI_LIB_DEPENDENCIES ${QT_GUI_LIB_DEPENDENCIES} ${QT_FONTCONFIG_LIBRARY})
MARK_AS_ADVANCED(QT_FONTCONFIG_LIBRARY)
ENDIF(QT_QCONFIG MATCHES "fontconfig")
--- 1359,1363 ----
IF(QT_QCONFIG MATCHES "fontconfig")
FIND_LIBRARY(QT_FONTCONFIG_LIBRARY NAMES fontconfig)
! SET(QT_QTGUI_LIB_DEPENDENCIES ${QT_QTGUI_LIB_DEPENDENCIES} ${QT_FONTCONFIG_LIBRARY})
MARK_AS_ADVANCED(QT_FONTCONFIG_LIBRARY)
ENDIF(QT_QCONFIG MATCHES "fontconfig")
***************
*** 1340,1346 ****
IF(QT_QCONFIG MATCHES "system-zlib")
FIND_LIBRARY(QT_ZLIB_LIBRARY NAMES z)
! SET(QT_CORE_LIB_DEPENDENCIES ${QT_CORE_LIB_DEPENDENCIES} ${QT_ZLIB_LIBRARY})
MARK_AS_ADVANCED(QT_ZLIB_LIBRARY)
ENDIF(QT_QCONFIG MATCHES "system-zlib")
## glib
--- 1366,1378 ----
IF(QT_QCONFIG MATCHES "system-zlib")
FIND_LIBRARY(QT_ZLIB_LIBRARY NAMES z)
! SET(QT_QTCORE_LIB_DEPENDENCIES ${QT_QTCORE_LIB_DEPENDENCIES} ${QT_ZLIB_LIBRARY})
MARK_AS_ADVANCED(QT_ZLIB_LIBRARY)
ENDIF(QT_QCONFIG MATCHES "system-zlib")
+
+ ## openssl
+ IF(QT_QCONFIG MATCHES "openssl")
+ FIND_PACKAGE(OpenSSL)
+ SET(QT_QTNETWORK_LIB_DEPENDENCIES ${QT_QTNETWORK_LIB_DEPENDENCIES} ${OPENSSL_LIBRARIES})
+ ENDIF(QT_QCONFIG MATCHES "openssl")
## glib
***************
*** 1366,1370 ****
MESSAGE(WARNING "Unable to find glib 2.0 to satisfy Qt dependency.")
ELSE(NOT QT_GLIB_LIBRARY OR NOT QT_GTHREAD_LIBRARY)
! SET(QT_CORE_LIB_DEPENDENCIES ${QT_CORE_LIB_DEPENDENCIES}
${QT_GTHREAD_LIBRARY} ${QT_GLIB_LIBRARY})
ENDIF(NOT QT_GLIB_LIBRARY OR NOT QT_GTHREAD_LIBRARY)
--- 1398,1402 ----
MESSAGE(WARNING "Unable to find glib 2.0 to satisfy Qt dependency.")
ELSE(NOT QT_GLIB_LIBRARY OR NOT QT_GTHREAD_LIBRARY)
! SET(QT_QTCORE_LIB_DEPENDENCIES ${QT_QTCORE_LIB_DEPENDENCIES}
${QT_GTHREAD_LIBRARY} ${QT_GLIB_LIBRARY})
ENDIF(NOT QT_GLIB_LIBRARY OR NOT QT_GTHREAD_LIBRARY)
***************
*** 1382,1390 ****
IF(QT_POSIX_TIMERS)
FIND_LIBRARY(QT_RT_LIBRARY NAMES rt)
! SET(QT_CORE_LIB_DEPENDENCIES ${QT_CORE_LIB_DEPENDENCIES} ${QT_RT_LIBRARY})
MARK_AS_ADVANCED(QT_RT_LIBRARY)
ENDIF(QT_POSIX_TIMERS)
ENDIF(QT_QCONFIG MATCHES "clock-monotonic")
!
IF(Q_WS_X11)
# X11 libraries Qt absolutely depends on
--- 1414,1422 ----
IF(QT_POSIX_TIMERS)
FIND_LIBRARY(QT_RT_LIBRARY NAMES rt)
! SET(QT_QTCORE_LIB_DEPENDENCIES ${QT_QTCORE_LIB_DEPENDENCIES} ${QT_RT_LIBRARY})
MARK_AS_ADVANCED(QT_RT_LIBRARY)
ENDIF(QT_POSIX_TIMERS)
ENDIF(QT_QCONFIG MATCHES "clock-monotonic")
!
IF(Q_WS_X11)
# X11 libraries Qt absolutely depends on
***************
*** 1395,1418 ****
SET(QT_TMP_STR "QT_X11_${QT_X11_LIB}_LIBRARY")
FIND_LIBRARY(${QT_TMP_STR} NAMES "${QT_X11_LIB}" PATHS ${QMAKE_LIBDIR_X11})
! SET(QT_GUI_LIB_DEPENDENCIES ${QT_GUI_LIB_DEPENDENCIES} ${${QT_TMP_STR}})
MARK_AS_ADVANCED(${QT_TMP_STR})
ENDFOREACH(QT_X11_LIB)
QT_QUERY_QMAKE(QT_LIBS_THREAD "QMAKE_LIBS_THREAD")
! SET(QT_CORE_LIB_DEPENDENCIES ${QT_CORE_LIB_DEPENDENCIES} ${QT_LIBS_THREAD})
QT_QUERY_QMAKE(QMAKE_LIBS_DYNLOAD "QMAKE_LIBS_DYNLOAD")
! SET (QT_CORE_LIB_DEPENDENCIES ${QT_CORE_LIB_DEPENDENCIES} ${QMAKE_LIBS_DYNLOAD})
ENDIF(Q_WS_X11)
IF(Q_WS_WIN)
! SET(QT_GUI_LIB_DEPENDENCIES ${QT_GUI_LIB_DEPENDENCIES} imm32 winmm)
! SET(QT_CORE_LIB_DEPENDENCIES ${QT_CORE_LIB_DEPENDENCIES} ws2_32)
ENDIF(Q_WS_WIN)
IF(Q_WS_MAC)
! SET(QT_GUI_LIB_DEPENDENCIES ${QT_GUI_LIB_DEPENDENCIES} "-framework Carbon" "-framework QuickTime")
! SET(QT_CORE_LIB_DEPENDENCIES ${QT_CORE_LIB_DEPENDENCIES} "-framework ApplicationServices")
ENDIF(Q_WS_MAC)
--- 1427,1461 ----
SET(QT_TMP_STR "QT_X11_${QT_X11_LIB}_LIBRARY")
FIND_LIBRARY(${QT_TMP_STR} NAMES "${QT_X11_LIB}" PATHS ${QMAKE_LIBDIR_X11})
! SET(QT_QTGUI_LIB_DEPENDENCIES ${QT_QTGUI_LIB_DEPENDENCIES} ${${QT_TMP_STR}})
MARK_AS_ADVANCED(${QT_TMP_STR})
ENDFOREACH(QT_X11_LIB)
QT_QUERY_QMAKE(QT_LIBS_THREAD "QMAKE_LIBS_THREAD")
! SET(QT_QTCORE_LIB_DEPENDENCIES ${QT_QTCORE_LIB_DEPENDENCIES} ${QT_LIBS_THREAD})
QT_QUERY_QMAKE(QMAKE_LIBS_DYNLOAD "QMAKE_LIBS_DYNLOAD")
! SET (QT_QTCORE_LIB_DEPENDENCIES ${QT_QTCORE_LIB_DEPENDENCIES} ${QMAKE_LIBS_DYNLOAD})
ENDIF(Q_WS_X11)
IF(Q_WS_WIN)
! SET(QT_QTGUI_LIB_DEPENDENCIES ${QT_QTGUI_LIB_DEPENDENCIES} imm32 winmm)
! SET(QT_QTCORE_LIB_DEPENDENCIES ${QT_QTCORE_LIB_DEPENDENCIES} ws2_32)
ENDIF(Q_WS_WIN)
IF(Q_WS_MAC)
! SET(QT_QTGUI_LIB_DEPENDENCIES ${QT_QTGUI_LIB_DEPENDENCIES} "-framework Carbon")
!
! # Qt 4.0, 4.1, 4.2 use QuickTime
! IF(found_qt_minor_vers LESS 3)
! SET(QT_QTGUI_LIB_DEPENDENCIES ${QT_QTGUI_LIB_DEPENDENCIES} "-framework QuickTime")
! ENDIF(found_qt_minor_vers LESS 3)
!
! # Qt 4.2+ use AppKit
! IF(found_qt_minor_vers GREATER 1)
! SET(QT_QTGUI_LIB_DEPENDENCIES ${QT_QTGUI_LIB_DEPENDENCIES} "-framework AppKit")
! ENDIF(found_qt_minor_vers LESS 1)
!
! SET(QT_QTCORE_LIB_DEPENDENCIES ${QT_QTCORE_LIB_DEPENDENCIES} "-framework ApplicationServices")
ENDIF(Q_WS_MAC)
Index: VTKCompatibility.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/VTKCompatibility.cmake,v
retrieving revision 1.10
retrieving revision 1.10.2.1
diff -C 2 -d -r1.10 -r1.10.2.1
*** VTKCompatibility.cmake 3 Mar 2008 16:57:02 -0000 1.10
--- VTKCompatibility.cmake 18 Mar 2008 14:23:52 -0000 1.10.2.1
***************
*** 32,40 ****
SET(TIFF_RIGHT_VERSION 1)
- # vtkRendering links to X11 with "-lXt ${X11_LIBRARIES}" because CMake
- # 2.4 and below did not provide the X11_Xt_LIB variable. We need the
- # linker search path compatiblity feature.
- SET(CMAKE_LINK_OLD_PATHS 1)
-
# for very old VTK (versions prior to 4.2)
MACRO(SOURCE_FILES)
--- 32,35 ----
Index: FindX11.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindX11.cmake,v
retrieving revision 1.31
retrieving revision 1.31.2.1
diff -C 2 -d -r1.31 -r1.31.2.1
*** FindX11.cmake 20 Jan 2008 21:02:38 -0000 1.31
--- FindX11.cmake 18 Mar 2008 14:23:52 -0000 1.31.2.1
***************
*** 128,131 ****
--- 128,132 ----
ENDIF(X11_X11_LIB)
+ SET(X11_INCLUDE_DIR) # start with empty list
IF(X11_X11_INCLUDE_PATH)
SET(X11_INCLUDE_DIR ${X11_INCLUDE_DIR} ${X11_X11_INCLUDE_PATH})
***************
*** 146,149 ****
--- 147,151 ----
ENDIF(X11_Xshape_INCLUDE_PATH)
+ SET(X11_LIBRARIES) # start with empty list
IF(X11_X11_LIB)
SET(X11_LIBRARIES ${X11_LIBRARIES} ${X11_X11_LIB})
***************
*** 355,359 ****
SET(X11_LIBRARIES ${X11_X_PRE_LIBS} ${X11_LIBRARIES} ${X11_X_EXTRA_LIBS})
! MESSAGE(STATUS "Found X11: ${X11_X11_LIB}")
ELSE (X11_FOUND)
IF (X11_FIND_REQUIRED)
--- 357,363 ----
SET(X11_LIBRARIES ${X11_X_PRE_LIBS} ${X11_LIBRARIES} ${X11_X_EXTRA_LIBS})
! INCLUDE(FindPackageMessage)
! FIND_PACKAGE_MESSAGE(X11 "Found X11: ${X11_X11_LIB}"
! "[${X11_X11_LIB}][${X11_INCLUDE_DIR}]")
ELSE (X11_FOUND)
IF (X11_FIND_REQUIRED)
Index: CTest.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/CTest.cmake,v
retrieving revision 1.10
retrieving revision 1.10.2.1
diff -C 2 -d -r1.10 -r1.10.2.1
*** CTest.cmake 17 Dec 2007 22:05:07 -0000 1.10
--- CTest.cmake 18 Mar 2008 14:23:51 -0000 1.10.2.1
***************
*** 105,109 ****
IF(NOT UPDATE_TYPE)
! MESSAGE(STATUS "Cannot determine repository type. Please set UPDATE_TYPE to 'cvs' or 'svn'. CTest update will not work.")
ENDIF(NOT UPDATE_TYPE)
--- 105,112 ----
IF(NOT UPDATE_TYPE)
! IF(NOT __CTEST_UPDATE_TYPE_COMPLAINED)
! SET(__CTEST_UPDATE_TYPE_COMPLAINED 1 CACHE INTERNAL "Already complained about update type.")
! MESSAGE(STATUS "CTest cannot determine repository type. Please set UPDATE_TYPE to 'cvs' or 'svn'. CTest update will not work.")
! ENDIF(NOT __CTEST_UPDATE_TYPE_COMPLAINED)
ENDIF(NOT UPDATE_TYPE)
Index: FindPackageHandleStandardArgs.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindPackageHandleStandardArgs.cmake,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -C 2 -d -r1.4 -r1.4.2.1
*** FindPackageHandleStandardArgs.cmake 6 Feb 2008 22:02:53 -0000 1.4
--- FindPackageHandleStandardArgs.cmake 18 Mar 2008 14:23:51 -0000 1.4.2.1
***************
*** 18,21 ****
--- 18,22 ----
# your own custom failure message there.
+ INCLUDE(FindPackageMessage)
FUNCTION(FIND_PACKAGE_HANDLE_STANDARD_ARGS _NAME _FAIL_MSG _VAR1 )
***************
*** 28,34 ****
--- 29,38 ----
STRING(TOUPPER ${_NAME} _NAME_UPPER)
+ SET(DETAILS "")
SET(${_NAME_UPPER}_FOUND TRUE)
IF(NOT ${_VAR1})
SET(${_NAME_UPPER}_FOUND FALSE)
+ ELSE(NOT ${_VAR1})
+ SET(DETAILS "${DETAILS}[${${_VAR1}}]")
ENDIF(NOT ${_VAR1})
***************
*** 37,47 ****
IF(NOT ${_CURRENT_VAR})
SET(${_NAME_UPPER}_FOUND FALSE)
ENDIF(NOT ${_CURRENT_VAR})
ENDFOREACH(_CURRENT_VAR)
IF (${_NAME_UPPER}_FOUND)
! IF (NOT ${_NAME}_FIND_QUIETLY)
! MESSAGE(STATUS "Found ${_NAME}: ${${_VAR1}}")
! ENDIF (NOT ${_NAME}_FIND_QUIETLY)
ELSE (${_NAME_UPPER}_FOUND)
IF (${_NAME}_FIND_REQUIRED)
--- 41,51 ----
IF(NOT ${_CURRENT_VAR})
SET(${_NAME_UPPER}_FOUND FALSE)
+ ELSE(NOT ${_CURRENT_VAR})
+ SET(DETAILS "${DETAILS}[${${_CURRENT_VAR}}]")
ENDIF(NOT ${_CURRENT_VAR})
ENDFOREACH(_CURRENT_VAR)
IF (${_NAME_UPPER}_FOUND)
! FIND_PACKAGE_MESSAGE(${_NAME} "Found ${_NAME}: ${${_VAR1}}" "${DETAILS}")
ELSE (${_NAME_UPPER}_FOUND)
IF (${_NAME}_FIND_REQUIRED)
More information about the Cmake-commits
mailing list