[Cmake-commits] [cmake-commits] hoffman committed CMakeASMInformation.cmake 1.3 1.3.2.1 CMakeCInformation.cmake 1.20.2.2 1.20.2.3 CMakeCXXInformation.cmake 1.24.2.2 1.24.2.3 CMakeFortranCompilerId.F90.in 1.1.2.1 1.1.2.2 CMakeFortranInformation.cmake 1.18.2.3 1.18.2.4 CMakePlatformId.h.in 1.2 1.2.2.1 CMakeRCInformation.cmake 1.5.14.1 1.5.14.2 CheckForPthreads.c 1.3 1.3.12.1 FindBoost.cmake 1.4.2.7 1.4.2.8 FindGLUT.cmake 1.20 1.20.2.1 FindMFC.cmake 1.5 1.5.14.1 FindPerlLibs.cmake 1.8 1.8.2.1 FindQt4.cmake 1.96.2.15 1.96.2.16 FindTclStub.cmake 1.4 1.4.2.1 FindwxWidgets.cmake 1.18.2.4 1.18.2.5
cmake-commits at cmake.org
cmake-commits at cmake.org
Fri Oct 24 11:18:47 EDT 2008
Update of /cvsroot/CMake/CMake/Modules
In directory public:/mounts/ram/cvs-serv25234/Modules
Modified Files:
Tag: CMake-2-6
CMakeASMInformation.cmake CMakeCInformation.cmake
CMakeCXXInformation.cmake CMakeFortranCompilerId.F90.in
CMakeFortranInformation.cmake CMakePlatformId.h.in
CMakeRCInformation.cmake CheckForPthreads.c FindBoost.cmake
FindGLUT.cmake FindMFC.cmake FindPerlLibs.cmake FindQt4.cmake
FindTclStub.cmake FindwxWidgets.cmake
Log Message:
ENH: merge in changes for 2.6.3 RC 1
Index: CMakeCInformation.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/CMakeCInformation.cmake,v
retrieving revision 1.20.2.2
retrieving revision 1.20.2.3
diff -C 2 -d -r1.20.2.2 -r1.20.2.3
*** CMakeCInformation.cmake 6 Aug 2008 21:04:18 -0000 1.20.2.2
--- CMakeCInformation.cmake 24 Oct 2008 15:18:45 -0000 1.20.2.3
***************
*** 13,17 ****
SET(CMAKE_C_OUTPUT_EXTENSION .obj)
ENDIF(UNIX)
!
GET_FILENAME_COMPONENT(CMAKE_BASE_NAME ${CMAKE_C_COMPILER} NAME_WE)
IF(CMAKE_COMPILER_IS_GNUCC)
--- 13,17 ----
SET(CMAKE_C_OUTPUT_EXTENSION .obj)
ENDIF(UNIX)
! SET(CMAKE_BASE_NAME)
GET_FILENAME_COMPONENT(CMAKE_BASE_NAME ${CMAKE_C_COMPILER} NAME_WE)
IF(CMAKE_COMPILER_IS_GNUCC)
***************
*** 33,40 ****
# load the system- and compiler specific files
IF(CMAKE_C_COMPILER_ID)
! INCLUDE(Platform/${CMAKE_SYSTEM_NAME}-${CMAKE_C_COMPILER_ID}-C OPTIONAL RESULT_VARIABLE _INCLUDED_FILE)
ENDIF(CMAKE_C_COMPILER_ID)
IF (NOT _INCLUDED_FILE)
! INCLUDE(Platform/${CMAKE_SYSTEM_NAME}-${CMAKE_BASE_NAME} OPTIONAL)
ENDIF (NOT _INCLUDED_FILE)
--- 33,50 ----
# load the system- and compiler specific files
IF(CMAKE_C_COMPILER_ID)
! INCLUDE(Platform/${CMAKE_SYSTEM_NAME}-${CMAKE_C_COMPILER_ID}-C
! OPTIONAL RESULT_VARIABLE _INCLUDED_FILE)
ENDIF(CMAKE_C_COMPILER_ID)
IF (NOT _INCLUDED_FILE)
! INCLUDE(Platform/${CMAKE_SYSTEM_NAME}-${CMAKE_BASE_NAME}
! OPTIONAL RESULT_VARIABLE _INCLUDED_FILE)
! ENDIF (NOT _INCLUDED_FILE)
! # some systems include the compiler information in the system file
! # and if this is the enable_language command then it may not have been
! # included at this point, or needs to be included again so that the
! # language_INIT variables are set correctly
! IF (NOT _INCLUDED_FILE)
! INCLUDE(Platform/${CMAKE_SYSTEM_NAME}
! OPTIONAL RESULT_VARIABLE _INCLUDED_FILE)
ENDIF (NOT _INCLUDED_FILE)
Index: CMakeFortranInformation.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/CMakeFortranInformation.cmake,v
retrieving revision 1.18.2.3
retrieving revision 1.18.2.4
diff -C 2 -d -r1.18.2.3 -r1.18.2.4
*** CMakeFortranInformation.cmake 6 Aug 2008 21:04:18 -0000 1.18.2.3
--- CMakeFortranInformation.cmake 24 Oct 2008 15:18:45 -0000 1.18.2.4
***************
*** 4,7 ****
--- 4,8 ----
# if it exists.
+ SET(CMAKE_BASE_NAME)
GET_FILENAME_COMPONENT(CMAKE_BASE_NAME ${CMAKE_Fortran_COMPILER} NAME_WE)
# since the gnu compiler has several names force g++
Index: FindTclStub.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindTclStub.cmake,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -C 2 -d -r1.4 -r1.4.2.1
*** FindTclStub.cmake 26 Jan 2008 06:11:04 -0000 1.4
--- FindTclStub.cmake 24 Oct 2008 15:18:45 -0000 1.4.2.1
***************
*** 9,12 ****
--- 9,13 ----
# TCL_STUB_LIBRARY = path to Tcl stub library
# TK_STUB_LIBRARY = path to Tk stub library
+ # TTK_STUB_LIBRARY = path to ttk stub library
#
# In an effort to remove some clutter and clear up some issues for people
***************
*** 102,105 ****
--- 103,117 ----
)
+ FIND_LIBRARY(TTK_STUB_LIBRARY
+ NAMES
+ ttkstub
+ ttkstub${TCL_LIBRARY_VERSION} ttkstub${TCL_TCLSH_VERSION} ttkstub${TK_WISH_VERSION}
+ ttkstub88 ttkstub8.8
+ ttkstub87 ttkstub8.7
+ ttkstub86 ttkstub8.6
+ ttkstub85 ttkstub8.5
+ PATHS ${TCLTK_POSSIBLE_LIB_PATHS}
+ )
+
MARK_AS_ADVANCED(
TCL_STUB_LIBRARY
Index: CheckForPthreads.c
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/CheckForPthreads.c,v
retrieving revision 1.3
retrieving revision 1.3.12.1
diff -C 2 -d -r1.3 -r1.3.12.1
*** CheckForPthreads.c 4 Dec 2006 22:26:08 -0000 1.3
--- CheckForPthreads.c 24 Oct 2008 15:18:45 -0000 1.3.12.1
***************
*** 17,21 ****
pthread_create(&tid[1], 0, runner, (void*)2);
! #if defined(__BEOS__) && !defined(__ZETA__) // (no usleep on BeOS 5.)
usleep(1); // for strange behavior on single-processor sun
#endif
--- 17,21 ----
pthread_create(&tid[1], 0, runner, (void*)2);
! #if defined(__BEOS__) && !defined(__ZETA__) && !defined(__HAIKU__) // (no usleep on BeOS 5.)
usleep(1); // for strange behavior on single-processor sun
#endif
Index: FindPerlLibs.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindPerlLibs.cmake,v
retrieving revision 1.8
retrieving revision 1.8.2.1
diff -C 2 -d -r1.8 -r1.8.2.1
*** FindPerlLibs.cmake 12 Dec 2007 12:26:25 -0000 1.8
--- FindPerlLibs.cmake 24 Oct 2008 15:18:45 -0000 1.8.2.1
***************
*** 23,28 ****
${PERL_POSSIBLE_INCLUDE_PATHS})
- FIND_PROGRAM(PERL_EXECUTABLE perl )
IF(PERL_EXECUTABLE)
--- 23,29 ----
${PERL_POSSIBLE_INCLUDE_PATHS})
+ # find the perl executable
+ INCLUDE(FindPerl)
IF(PERL_EXECUTABLE)
Index: FindQt4.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindQt4.cmake,v
retrieving revision 1.96.2.15
retrieving revision 1.96.2.16
diff -C 2 -d -r1.96.2.15 -r1.96.2.16
*** FindQt4.cmake 22 Sep 2008 14:05:16 -0000 1.96.2.15
--- FindQt4.cmake 24 Oct 2008 15:18:45 -0000 1.96.2.16
***************
*** 178,182 ****
#
# QT_INCLUDE_DIR Path to "include" of Qt4
- # QT_QT_INCLUDE_DIR Path to "include/Qt"
# QT_QT3SUPPORT_INCLUDE_DIR Path to "include/Qt3Support"
# QT_QTASSISTANT_INCLUDE_DIR Path to "include/QtAssistant"
--- 178,181 ----
***************
*** 322,325 ****
--- 321,330 ----
IF (QT_QMAKE_EXECUTABLE)
+ IF(QT_QMAKE_EXECUTABLE_LAST AND NOT QT_QMAKE_EXECUTABLE_LAST MATCHES "^${QT_QMAKE_EXECUTABLE}$")
+ SET(QT_QMAKE_CHANGED 1)
+ ENDIF(QT_QMAKE_EXECUTABLE_LAST AND NOT QT_QMAKE_EXECUTABLE_LAST MATCHES "^${QT_QMAKE_EXECUTABLE}$")
+
+ SET(QT_QMAKE_EXECUTABLE_LAST "${QT_QMAKE_EXECUTABLE}" CACHE INTERNAL "" FORCE)
+
SET(QT4_QMAKE_FOUND FALSE)
***************
*** 387,391 ****
# ask qmake for the library dir
# Set QT_LIBRARY_DIR
! IF (NOT QT_LIBRARY_DIR)
EXEC_PROGRAM( ${QT_QMAKE_EXECUTABLE}
ARGS "-query QT_INSTALL_LIBS"
--- 392,396 ----
# ask qmake for the library dir
# Set QT_LIBRARY_DIR
! IF (NOT QT_LIBRARY_DIR OR QT_QMAKE_CHANGED)
EXEC_PROGRAM( ${QT_QMAKE_EXECUTABLE}
ARGS "-query QT_INSTALL_LIBS"
***************
*** 394,411 ****
FILE(TO_CMAKE_PATH "${QT_LIBRARY_DIR_TMP}" QT_LIBRARY_DIR_TMP)
IF(EXISTS "${QT_LIBRARY_DIR_TMP}")
! SET(QT_LIBRARY_DIR ${QT_LIBRARY_DIR_TMP} CACHE PATH "Qt library dir")
ELSE(EXISTS "${QT_LIBRARY_DIR_TMP}")
MESSAGE("Warning: QT_QMAKE_EXECUTABLE reported QT_INSTALL_LIBS as ${QT_LIBRARY_DIR_TMP}")
MESSAGE("Warning: ${QT_LIBRARY_DIR_TMP} does NOT exist, Qt must NOT be installed correctly.")
ENDIF(EXISTS "${QT_LIBRARY_DIR_TMP}")
! ENDIF(NOT QT_LIBRARY_DIR)
IF (APPLE)
IF (EXISTS ${QT_LIBRARY_DIR}/QtCore.framework)
SET(QT_USE_FRAMEWORKS ON
! CACHE BOOL "Set to ON if Qt build uses frameworks.")
ELSE (EXISTS ${QT_LIBRARY_DIR}/QtCore.framework)
SET(QT_USE_FRAMEWORKS OFF
! CACHE BOOL "Set to ON if Qt build uses frameworks.")
ENDIF (EXISTS ${QT_LIBRARY_DIR}/QtCore.framework)
--- 399,416 ----
FILE(TO_CMAKE_PATH "${QT_LIBRARY_DIR_TMP}" QT_LIBRARY_DIR_TMP)
IF(EXISTS "${QT_LIBRARY_DIR_TMP}")
! SET(QT_LIBRARY_DIR ${QT_LIBRARY_DIR_TMP} CACHE PATH "Qt library dir" FORCE)
ELSE(EXISTS "${QT_LIBRARY_DIR_TMP}")
MESSAGE("Warning: QT_QMAKE_EXECUTABLE reported QT_INSTALL_LIBS as ${QT_LIBRARY_DIR_TMP}")
MESSAGE("Warning: ${QT_LIBRARY_DIR_TMP} does NOT exist, Qt must NOT be installed correctly.")
ENDIF(EXISTS "${QT_LIBRARY_DIR_TMP}")
! ENDIF(NOT QT_LIBRARY_DIR OR QT_QMAKE_CHANGED)
IF (APPLE)
IF (EXISTS ${QT_LIBRARY_DIR}/QtCore.framework)
SET(QT_USE_FRAMEWORKS ON
! CACHE BOOL "Set to ON if Qt build uses frameworks." FORCE)
ELSE (EXISTS ${QT_LIBRARY_DIR}/QtCore.framework)
SET(QT_USE_FRAMEWORKS OFF
! CACHE BOOL "Set to ON if Qt build uses frameworks." FORCE)
ENDIF (EXISTS ${QT_LIBRARY_DIR}/QtCore.framework)
***************
*** 414,418 ****
# ask qmake for the binary dir
! IF (QT_LIBRARY_DIR AND NOT QT_BINARY_DIR)
EXEC_PROGRAM(${QT_QMAKE_EXECUTABLE}
ARGS "-query QT_INSTALL_BINS"
--- 419,423 ----
# ask qmake for the binary dir
! IF ((QT_LIBRARY_DIR AND NOT QT_BINARY_DIR) OR QT_QMAKE_CHANGED)
EXEC_PROGRAM(${QT_QMAKE_EXECUTABLE}
ARGS "-query QT_INSTALL_BINS"
***************
*** 420,428 ****
# make sure we have / and not \ as qmake gives on windows
FILE(TO_CMAKE_PATH "${qt_bins}" qt_bins)
! SET(QT_BINARY_DIR ${qt_bins} CACHE INTERNAL "")
! ENDIF (QT_LIBRARY_DIR AND NOT QT_BINARY_DIR)
# ask qmake for the include dir
! IF (QT_LIBRARY_DIR AND NOT QT_HEADERS_DIR)
EXEC_PROGRAM( ${QT_QMAKE_EXECUTABLE}
ARGS "-query QT_INSTALL_HEADERS"
--- 425,433 ----
# make sure we have / and not \ as qmake gives on windows
FILE(TO_CMAKE_PATH "${qt_bins}" qt_bins)
! SET(QT_BINARY_DIR ${qt_bins} CACHE INTERNAL "" FORCE)
! ENDIF ((QT_LIBRARY_DIR AND NOT QT_BINARY_DIR) OR QT_QMAKE_CHANGED)
# ask qmake for the include dir
! IF ((QT_LIBRARY_DIR AND NOT QT_HEADERS_DIR) OR QT_QMAKE_CHANGED)
EXEC_PROGRAM( ${QT_QMAKE_EXECUTABLE}
ARGS "-query QT_INSTALL_HEADERS"
***************
*** 430,439 ****
# make sure we have / and not \ as qmake gives on windows
FILE(TO_CMAKE_PATH "${qt_headers}" qt_headers)
! SET(QT_HEADERS_DIR ${qt_headers} CACHE INTERNAL "")
! ENDIF(QT_LIBRARY_DIR AND NOT QT_HEADERS_DIR)
# ask qmake for the documentation directory
! IF (QT_LIBRARY_DIR AND NOT QT_DOC_DIR)
EXEC_PROGRAM( ${QT_QMAKE_EXECUTABLE}
ARGS "-query QT_INSTALL_DOCS"
--- 435,444 ----
# make sure we have / and not \ as qmake gives on windows
FILE(TO_CMAKE_PATH "${qt_headers}" qt_headers)
! SET(QT_HEADERS_DIR ${qt_headers} CACHE INTERNAL "" FORCE)
! ENDIF ((QT_LIBRARY_DIR AND NOT QT_HEADERS_DIR) OR QT_QMAKE_CHANGED)
# ask qmake for the documentation directory
! IF ((QT_LIBRARY_DIR AND NOT QT_DOC_DIR) OR QT_QMAKE_CHANGED)
EXEC_PROGRAM( ${QT_QMAKE_EXECUTABLE}
ARGS "-query QT_INSTALL_DOCS"
***************
*** 441,449 ****
# make sure we have / and not \ as qmake gives on windows
FILE(TO_CMAKE_PATH "${qt_doc_dir}" qt_doc_dir)
! SET(QT_DOC_DIR ${qt_doc_dir} CACHE PATH "The location of the Qt docs")
! ENDIF (QT_LIBRARY_DIR AND NOT QT_DOC_DIR)
# ask qmake for the mkspecs directory
! IF (QT_LIBRARY_DIR AND NOT QT_MKSPECS_DIR)
EXEC_PROGRAM( ${QT_QMAKE_EXECUTABLE}
ARGS "-query QMAKE_MKSPECS"
--- 446,454 ----
# make sure we have / and not \ as qmake gives on windows
FILE(TO_CMAKE_PATH "${qt_doc_dir}" qt_doc_dir)
! SET(QT_DOC_DIR ${qt_doc_dir} CACHE PATH "The location of the Qt docs" FORCE)
! ENDIF ((QT_LIBRARY_DIR AND NOT QT_DOC_DIR) OR QT_QMAKE_CHANGED)
# ask qmake for the mkspecs directory
! IF ((QT_LIBRARY_DIR AND NOT QT_MKSPECS_DIR) OR QT_QMAKE_CHANGED)
EXEC_PROGRAM( ${QT_QMAKE_EXECUTABLE}
ARGS "-query QMAKE_MKSPECS"
***************
*** 454,464 ****
STRING(REPLACE ":" ";" qt_mkspecs_dirs "${qt_mkspecs_dirs}")
ENDIF(UNIX)
FIND_PATH(QT_MKSPECS_DIR qconfig.pri PATHS ${qt_mkspecs_dirs}
DOC "The location of the Qt mkspecs containing qconfig.pri"
NO_DEFAULT_PATH )
! ENDIF (QT_LIBRARY_DIR AND NOT QT_MKSPECS_DIR)
# ask qmake for the plugins directory
! IF (QT_LIBRARY_DIR AND NOT QT_PLUGINS_DIR)
EXEC_PROGRAM( ${QT_QMAKE_EXECUTABLE}
ARGS "-query QT_INSTALL_PLUGINS"
--- 459,470 ----
STRING(REPLACE ":" ";" qt_mkspecs_dirs "${qt_mkspecs_dirs}")
ENDIF(UNIX)
+ SET(QT_MKSPECS_DIR NOTFOUND)
FIND_PATH(QT_MKSPECS_DIR qconfig.pri PATHS ${qt_mkspecs_dirs}
DOC "The location of the Qt mkspecs containing qconfig.pri"
NO_DEFAULT_PATH )
! ENDIF ((QT_LIBRARY_DIR AND NOT QT_MKSPECS_DIR) OR QT_QMAKE_CHANGED)
# ask qmake for the plugins directory
! IF ((QT_LIBRARY_DIR AND NOT QT_PLUGINS_DIR) OR QT_QMAKE_CHANGED)
EXEC_PROGRAM( ${QT_QMAKE_EXECUTABLE}
ARGS "-query QT_INSTALL_PLUGINS"
***************
*** 466,471 ****
# make sure we have / and not \ as qmake gives on windows
FILE(TO_CMAKE_PATH "${qt_plugins_dir}" qt_plugins_dir)
! SET(QT_PLUGINS_DIR ${qt_plugins_dir} CACHE PATH "The location of the Qt plugins")
! ENDIF (QT_LIBRARY_DIR AND NOT QT_PLUGINS_DIR)
########################################
#
--- 472,477 ----
# make sure we have / and not \ as qmake gives on windows
FILE(TO_CMAKE_PATH "${qt_plugins_dir}" qt_plugins_dir)
! SET(QT_PLUGINS_DIR ${qt_plugins_dir} CACHE PATH "The location of the Qt plugins" FORCE)
! ENDIF ((QT_LIBRARY_DIR AND NOT QT_PLUGINS_DIR) OR QT_QMAKE_CHANGED)
########################################
#
***************
*** 474,484 ****
########################################
! FIND_PATH(QT_QTCORE_INCLUDE_DIR QtGlobal
PATHS
! ${QT_HEADERS_DIR}/QtCore
! ${QT_LIBRARY_DIR}/QtCore.framework/Headers
NO_DEFAULT_PATH
)
!
# Set QT_INCLUDE_DIR by removine "/QtCore" in the string ${QT_QTCORE_INCLUDE_DIR}
IF( QT_QTCORE_INCLUDE_DIR AND NOT QT_INCLUDE_DIR)
--- 480,541 ----
########################################
! SET(QT_MODULES QtCore QtGui Qt3Support QtSvg QtScript QtTest QtUiTools
! QtHelp QtWebKit QtXmlPatterns phonon QtMotif QtNetwork
! QtNsPlugin QtOpenGL QtSql QtXml QtDesigner QtDBus)
!
! IF(QT_QMAKE_CHANGED)
! FOREACH(QT_MODULE ${QT_MODULES})
! STRING(TOUPPER ${QT_MODULE} _upper_qt_module)
! SET(QT_${_upper_qt_module}_INCLUDE_DIR NOTFOUND)
! SET(QT_${_upper_qt_module}_LIBRARY_RELEASE NOTFOUND)
! SET(QT_${_upper_qt_module}_LIBRARY_DEBUG NOTFOUND)
! ENDFOREACH(QT_MODULE)
! SET(QT_QTDESIGNERCOMPONENTS_INCLUDE_DIR NOTFOUND)
! SET(QT_QTDESIGNERCOMPONENTS_LIBRARY_RELEASE NOTFOUND)
! SET(QT_QTDESIGNERCOMPONENTS_LIBRARY_DEBUG NOTFOUND)
! SET(QT_QTASSISTANTCLIENT_INCLUDE_DIR NOTFOUND)
! SET(QT_QTASSISTANTCLIENT_LIBRARY_RELEASE NOTFOUND)
! SET(QT_QTASSISTANTCLIENT_LIBRARY_DEBUG NOTFOUND)
! SET(QT_QTASSISTANT_INCLUDE_DIR NOTFOUND)
! SET(QT_QTASSISTANT_LIBRARY_RELEASE NOTFOUND)
! SET(QT_QTASSISTANT_LIBRARY_DEBUG NOTFOUND)
! SET(QT_QTCLUCENE_LIBRARY_RELEASE NOTFOUND)
! SET(QT_QTCLUCENE_LIBRARY_DEBUG NOTFOUND)
! ENDIF(QT_QMAKE_CHANGED)
!
! FOREACH(QT_MODULE ${QT_MODULES})
! STRING(TOUPPER ${QT_MODULE} _upper_qt_module)
! FIND_PATH(QT_${_upper_qt_module}_INCLUDE_DIR ${QT_MODULE}
! PATHS
! ${QT_HEADERS_DIR}/${QT_MODULE}
! ${QT_LIBRARY_DIR}/${QT_MODULE}.framework/Headers
! NO_DEFAULT_PATH
! )
! ENDFOREACH(QT_MODULE)
!
! # Set QT_QTDESIGNERCOMPONENTS_INCLUDE_DIR
! FIND_PATH(QT_QTDESIGNERCOMPONENTS_INCLUDE_DIR QDesignerComponents
PATHS
! ${QT_INCLUDE_DIR}/QtDesigner
! ${QT_LIBRARY_DIR}/QtDesigner.framework/Headers
NO_DEFAULT_PATH
)
!
! # Set QT_QTASSISTANT_INCLUDE_DIR
! FIND_PATH(QT_QTASSISTANT_INCLUDE_DIR QAssistantClient
! PATHS
! ${QT_INCLUDE_DIR}/QtAssistant
! ${QT_LIBRARY_DIR}/QtAssistant.framework/Headers
! NO_DEFAULT_PATH
! )
!
! # Set QT_QTASSISTANTCLIENT_INCLUDE_DIR
! FIND_PATH(QT_QTASSISTANTCLIENT_INCLUDE_DIR QAssistantClient
! PATHS
! ${QT_INCLUDE_DIR}/QtAssistant
! ${QT_LIBRARY_DIR}/QtAssistant.framework/Headers
! NO_DEFAULT_PATH
! )
!
# Set QT_INCLUDE_DIR by removine "/QtCore" in the string ${QT_QTCORE_INCLUDE_DIR}
IF( QT_QTCORE_INCLUDE_DIR AND NOT QT_INCLUDE_DIR)
***************
*** 487,491 ****
ELSE (QT_USE_FRAMEWORKS)
STRING( REGEX REPLACE "/QtCore$" "" qt4_include_dir ${QT_QTCORE_INCLUDE_DIR})
! SET( QT_INCLUDE_DIR ${qt4_include_dir} CACHE PATH "")
ENDIF (QT_USE_FRAMEWORKS)
ENDIF( QT_QTCORE_INCLUDE_DIR AND NOT QT_INCLUDE_DIR)
--- 544,548 ----
ELSE (QT_USE_FRAMEWORKS)
STRING( REGEX REPLACE "/QtCore$" "" qt4_include_dir ${QT_QTCORE_INCLUDE_DIR})
! SET( QT_INCLUDE_DIR ${qt4_include_dir})
ENDIF (QT_USE_FRAMEWORKS)
ENDIF( QT_QTCORE_INCLUDE_DIR AND NOT QT_INCLUDE_DIR)
***************
*** 493,499 ****
IF( NOT QT_INCLUDE_DIR)
IF(Qt4_FIND_REQUIRED)
! MESSAGE( FATAL_ERROR "Could NOT find QtGlobal header")
ENDIF(Qt4_FIND_REQUIRED)
ENDIF( NOT QT_INCLUDE_DIR)
#############################################
--- 550,563 ----
IF( NOT QT_INCLUDE_DIR)
IF(Qt4_FIND_REQUIRED)
! MESSAGE( FATAL_ERROR "Could NOT find QtCore header")
ENDIF(Qt4_FIND_REQUIRED)
ENDIF( NOT QT_INCLUDE_DIR)
+
+ # Make variables changeble to the advanced user
+ MARK_AS_ADVANCED( QT_LIBRARY_DIR QT_INCLUDE_DIR QT_DOC_DIR QT_MKSPECS_DIR QT_PLUGINS_DIR)
+
+ # Set QT_INCLUDES
+ SET( QT_INCLUDES ${QT_MKSPECS_DIR}/default ${QT_INCLUDE_DIR} )
+
#############################################
***************
*** 530,760 ****
#############################################
- # Set QT_QT3SUPPORT_INCLUDE_DIR
- FIND_PATH(QT_QT3SUPPORT_INCLUDE_DIR Qt3Support
- PATHS
- ${QT_INCLUDE_DIR}/Qt3Support
- ${QT_LIBRARY_DIR}/Qt3Support.framework/Headers
- NO_DEFAULT_PATH
- )
-
- # Set QT_QT_INCLUDE_DIR
- FIND_PATH(QT_QT_INCLUDE_DIR qglobal.h
- PATHS
- ${QT_INCLUDE_DIR}/Qt
- ${QT_LIBRARY_DIR}/QtCore.framework/Headers
- NO_DEFAULT_PATH
- )
-
- # Set QT_QTGUI_INCLUDE_DIR
- FIND_PATH(QT_QTGUI_INCLUDE_DIR QtGui
- PATHS
- ${QT_INCLUDE_DIR}/QtGui
- ${QT_LIBRARY_DIR}/QtGui.framework/Headers
- NO_DEFAULT_PATH
- )
-
- # Set QT_QTSVG_INCLUDE_DIR
- FIND_PATH(QT_QTSVG_INCLUDE_DIR QtSvg
- PATHS
- ${QT_INCLUDE_DIR}/QtSvg
- ${QT_LIBRARY_DIR}/QtSvg.framework/Headers
- NO_DEFAULT_PATH
- )
-
- # Set QT_QTSCRIPT_INCLUDE_DIR
- FIND_PATH(QT_QTSCRIPT_INCLUDE_DIR QtScript
- PATHS
- ${QT_INCLUDE_DIR}/QtScript
- ${QT_LIBRARY_DIR}/QtScript.framework/Headers
- NO_DEFAULT_PATH
- )
-
- # Set QT_QTTEST_INCLUDE_DIR
- FIND_PATH(QT_QTTEST_INCLUDE_DIR QtTest
- PATHS
- ${QT_INCLUDE_DIR}/QtTest
- ${QT_LIBRARY_DIR}/QtTest.framework/Headers
- NO_DEFAULT_PATH
- )
-
- # Set QT_QTUITOOLS_INCLUDE_DIR
- FIND_PATH(QT_QTUITOOLS_INCLUDE_DIR QtUiTools
- PATHS
- ${QT_INCLUDE_DIR}/QtUiTools
- ${QT_LIBRARY_DIR}/QtUiTools.framework/Headers
- NO_DEFAULT_PATH
- )
-
- # Set QT_QTMOTIF_INCLUDE_DIR
- IF(Q_WS_X11)
- FIND_PATH(QT_QTMOTIF_INCLUDE_DIR QtMotif
- PATHS
- ${QT_INCLUDE_DIR}/QtMotif
- NO_DEFAULT_PATH )
- ENDIF(Q_WS_X11)
-
- # Set QT_QTNETWORK_INCLUDE_DIR
- FIND_PATH(QT_QTNETWORK_INCLUDE_DIR QtNetwork
- PATHS
- ${QT_INCLUDE_DIR}/QtNetwork
- ${QT_LIBRARY_DIR}/QtNetwork.framework/Headers
- NO_DEFAULT_PATH
- )
-
- # Set QT_QTNSPLUGIN_INCLUDE_DIR
- FIND_PATH(QT_QTNSPLUGIN_INCLUDE_DIR QtNsPlugin
- PATHS
- ${QT_INCLUDE_DIR}/QtNsPlugin
- ${QT_LIBRARY_DIR}/QtNsPlugin.framework/Headers
- NO_DEFAULT_PATH
- )
-
- # Set QT_QTOPENGL_INCLUDE_DIR
- FIND_PATH(QT_QTOPENGL_INCLUDE_DIR QtOpenGL
- PATHS
- ${QT_INCLUDE_DIR}/QtOpenGL
- ${QT_LIBRARY_DIR}/QtOpenGL.framework/Headers
- NO_DEFAULT_PATH
- )
-
- # Set QT_QTSQL_INCLUDE_DIR
- FIND_PATH(QT_QTSQL_INCLUDE_DIR QtSql
- PATHS
- ${QT_INCLUDE_DIR}/QtSql
- ${QT_LIBRARY_DIR}/QtSql.framework/Headers
- NO_DEFAULT_PATH
- )
-
- # Set QT_QTXML_INCLUDE_DIR
- FIND_PATH(QT_QTXML_INCLUDE_DIR QtXml
- PATHS
- ${QT_INCLUDE_DIR}/QtXml
- ${QT_LIBRARY_DIR}/QtXml.framework/Headers
- NO_DEFAULT_PATH
- )
-
- # Set QT_QTASSISTANT_INCLUDE_DIR
- FIND_PATH(QT_QTASSISTANT_INCLUDE_DIR QtAssistant
- PATHS
- ${QT_INCLUDE_DIR}/QtAssistant
- ${QT_LIBRARY_DIR}/QtAssistant.framework/Headers
- NO_DEFAULT_PATH
- )
-
- # Set QT_QTDESIGNER_INCLUDE_DIR
- FIND_PATH(QT_QTDESIGNER_INCLUDE_DIR QDesignerComponents
- PATHS
- ${QT_INCLUDE_DIR}/QtDesigner
- ${QT_LIBRARY_DIR}/QtDesigner.framework/Headers
- NO_DEFAULT_PATH
- )
-
- # Set QT_QTDESIGNERCOMPONENTS_INCLUDE_DIR
- FIND_PATH(QT_QTDESIGNERCOMPONENTS_INCLUDE_DIR QDesignerComponents
- PATHS
- ${QT_INCLUDE_DIR}/QtDesigner
- ${QT_LIBRARY_DIR}/QtDesigner.framework/Headers
- NO_DEFAULT_PATH
- )
-
- # Set QT_QTDBUS_INCLUDE_DIR
- FIND_PATH(QT_QTDBUS_INCLUDE_DIR QtDBus
- PATHS
- ${QT_INCLUDE_DIR}/QtDBus
- ${QT_LIBRARY_DIR}/QtDBus.framework/Headers
- NO_DEFAULT_PATH
- )
-
- # Set QT_QTASSISTANTCLIENT_INCLUDE_DIR
- FIND_PATH(QT_QTASSISTANTCLIENT_INCLUDE_DIR QAssistantClient
- PATHS
- ${QT_INCLUDE_DIR}/QtAssistant
- ${QT_LIBRARY_DIR}/QtAssistant.framework/Headers
- NO_DEFAULT_PATH
- )
-
- # Set QT_QTHELP_INCLUDE_DIR
- FIND_PATH(QT_QTHELP_INCLUDE_DIR QtHelp
- PATHS
- ${QT_INCLUDE_DIR}/QtHelp
- ${QT_LIBRARY_DIR}/QtHelp.framework/Headers
- NO_DEFAULT_PATH
- )
-
- # Set QT_QTWEBKIT_INCLUDE_DIR
- FIND_PATH(QT_QTWEBKIT_INCLUDE_DIR QtWebKit
- PATHS
- ${QT_INCLUDE_DIR}/QtWebKit
- ${QT_LIBRARY_DIR}/QtWebKit.framework/Headers
- NO_DEFAULT_PATH
- )
! # Set QT_QTXMLPATTERNS_INCLUDE_DIR
! FIND_PATH(QT_QTXMLPATTERNS_INCLUDE_DIR QtXmlPatterns
! PATHS
! ${QT_INCLUDE_DIR}/QtXmlPatterns
! ${QT_LIBRARY_DIR}/QtXmlPatterns.framework/Headers
! NO_DEFAULT_PATH
! )
!
! # Set QT_PHONON_INCLUDE_DIR
! FIND_PATH(QT_PHONON_INCLUDE_DIR phonon
! PATHS
! ${QT_INCLUDE_DIR}/phonon
! ${QT_LIBRARY_DIR}/phonon.framework/Headers
! NO_DEFAULT_PATH
! )
!
! # Make variables changeble to the advanced user
! MARK_AS_ADVANCED( QT_LIBRARY_DIR QT_INCLUDE_DIR QT_QT_INCLUDE_DIR QT_DOC_DIR QT_MKSPECS_DIR QT_PLUGINS_DIR)
!
! # Set QT_INCLUDES
! SET( QT_INCLUDES ${QT_QT_INCLUDE_DIR} ${QT_MKSPECS_DIR}/default ${QT_INCLUDE_DIR} )
!
! # Set QT_QTCORE_LIBRARY by searching for a lib with "QtCore." as part of the filename
! FIND_LIBRARY(QT_QTCORE_LIBRARY_RELEASE NAMES QtCore QtCore4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH )
! FIND_LIBRARY(QT_QTCORE_LIBRARY_DEBUG NAMES QtCore_debug QtCored QtCored4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
!
! # Set QT_QT3SUPPORT_LIBRARY
! FIND_LIBRARY(QT_QT3SUPPORT_LIBRARY_RELEASE NAMES Qt3Support Qt3Support4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
! FIND_LIBRARY(QT_QT3SUPPORT_LIBRARY_DEBUG NAMES Qt3Support_debug Qt3Supportd Qt3Supportd4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
!
! # Set QT_QTGUI_LIBRARY
! FIND_LIBRARY(QT_QTGUI_LIBRARY_RELEASE NAMES QtGui QtGui4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
! FIND_LIBRARY(QT_QTGUI_LIBRARY_DEBUG NAMES QtGui_debug QtGuid QtGuid4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
!
! # Set QT_QTMOTIF_LIBRARY
! IF(Q_WS_X11)
! FIND_LIBRARY(QT_QTMOTIF_LIBRARY_RELEASE NAMES QtMotif PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
! FIND_LIBRARY(QT_QTMOTIF_LIBRARY_DEBUG NAMES QtMotif_debug PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
! ENDIF(Q_WS_X11)
!
! # Set QT_QTNETWORK_LIBRARY
! FIND_LIBRARY(QT_QTNETWORK_LIBRARY_RELEASE NAMES QtNetwork QtNetwork4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
! FIND_LIBRARY(QT_QTNETWORK_LIBRARY_DEBUG NAMES QtNetwork_debug QtNetworkd QtNetworkd4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
!
! # Set QT_QTNSPLUGIN_LIBRARY
! FIND_LIBRARY(QT_QTNSPLUGIN_LIBRARY_RELEASE NAMES QtNsPlugin PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
! FIND_LIBRARY(QT_QTNSPLUGIN_LIBRARY_DEBUG NAMES QtNsPlugin_debug PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
!
! # Set QT_QTOPENGL_LIBRARY
! FIND_LIBRARY(QT_QTOPENGL_LIBRARY_RELEASE NAMES QtOpenGL QtOpenGL4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
! FIND_LIBRARY(QT_QTOPENGL_LIBRARY_DEBUG NAMES QtOpenGL_debug QtOpenGLd QtOpenGLd4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
!
! # Set QT_QTSQL_LIBRARY
! FIND_LIBRARY(QT_QTSQL_LIBRARY_RELEASE NAMES QtSql QtSql4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
! FIND_LIBRARY(QT_QTSQL_LIBRARY_DEBUG NAMES QtSql_debug QtSqld QtSqld4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
!
! # Set QT_QTXML_LIBRARY
! FIND_LIBRARY(QT_QTXML_LIBRARY_RELEASE NAMES QtXml QtXml4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
! FIND_LIBRARY(QT_QTXML_LIBRARY_DEBUG NAMES QtXml_debug QtXmld QtXmld4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
!
! # Set QT_QTSVG_LIBRARY
! FIND_LIBRARY(QT_QTSVG_LIBRARY_RELEASE NAMES QtSvg QtSvg4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
! FIND_LIBRARY(QT_QTSVG_LIBRARY_DEBUG NAMES QtSvg_debug QtSvgd QtSvgd4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
- # Set QT_QTUITOOLS_LIBRARY
- FIND_LIBRARY(QT_QTUITOOLS_LIBRARY_RELEASE NAMES QtUiTools QtUiTools4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
- FIND_LIBRARY(QT_QTUITOOLS_LIBRARY_DEBUG NAMES QtUiTools_debug QtUiToolsd QtUiToolsd4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
# QtUiTools not with other frameworks with binary installation (in /usr/lib)
IF(Q_WS_MAC AND QT_QTCORE_LIBRARY_RELEASE AND NOT QT_QTUITOOLS_LIBRARY_RELEASE)
--- 594,611 ----
#############################################
! # find the libraries
! FOREACH(QT_MODULE ${QT_MODULES})
! STRING(TOUPPER ${QT_MODULE} _upper_qt_module)
! FIND_LIBRARY(QT_${_upper_qt_module}_LIBRARY_RELEASE
! NAMES ${QT_MODULE} ${QT_MODULE}4
! PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH
! )
! FIND_LIBRARY(QT_${_upper_qt_module}_LIBRARY_DEBUG
! NAMES ${QT_MODULE}_debug ${QT_MODULE}d ${QT_MODULE}d4
! PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH
! )
! ENDFOREACH(QT_MODULE)
# QtUiTools not with other frameworks with binary installation (in /usr/lib)
IF(Q_WS_MAC AND QT_QTCORE_LIBRARY_RELEASE AND NOT QT_QTUITOOLS_LIBRARY_RELEASE)
***************
*** 762,779 ****
ENDIF(Q_WS_MAC AND QT_QTCORE_LIBRARY_RELEASE AND NOT QT_QTUITOOLS_LIBRARY_RELEASE)
- # Set QT_QTTEST_LIBRARY
- FIND_LIBRARY(QT_QTTEST_LIBRARY_RELEASE NAMES QtTest QtTest4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
- FIND_LIBRARY(QT_QTTEST_LIBRARY_DEBUG NAMES QtTest_debug QtTestd QtTestd4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
-
- # Set QT_QTDBUS_LIBRARY
- # This was introduced with Qt 4.2, where also the naming scheme for debug libs was changed
- # So does any of the debug lib names listed here actually exist ?
- FIND_LIBRARY(QT_QTDBUS_LIBRARY_RELEASE NAMES QtDBus QtDBus4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
- FIND_LIBRARY(QT_QTDBUS_LIBRARY_DEBUG NAMES QtDBus_debug QtDBusd QtDBusd4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
-
- # Set QT_QTSCRIPT_LIBRARY
- FIND_LIBRARY(QT_QTSCRIPT_LIBRARY_RELEASE NAMES QtScript QtScript4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
- FIND_LIBRARY(QT_QTSCRIPT_LIBRARY_DEBUG NAMES QtScript_debug QtScriptd QtScriptd4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
-
IF( NOT QT_QTCORE_LIBRARY_DEBUG AND NOT QT_QTCORE_LIBRARY_RELEASE )
--- 613,616 ----
***************
*** 790,801 ****
ENDIF( NOT QT_QTCORE_LIBRARY_DEBUG AND NOT QT_QTCORE_LIBRARY_RELEASE )
- # Set QT_QTASSISTANT_LIBRARY
- FIND_LIBRARY(QT_QTASSISTANT_LIBRARY_RELEASE NAMES QtAssistantClient QtAssistantClient4 QtAssistant QtAssistant4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
- FIND_LIBRARY(QT_QTASSISTANT_LIBRARY_DEBUG NAMES QtAssistantClientd QtAssistantClientd4 QtAssistantClient_debug QtAssistant_debug QtAssistantd4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
-
- # Set QT_QTDESIGNER_LIBRARY
- FIND_LIBRARY(QT_QTDESIGNER_LIBRARY_RELEASE NAMES QtDesigner QtDesigner4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
- FIND_LIBRARY(QT_QTDESIGNER_LIBRARY_DEBUG NAMES QtDesigner_debug QtDesignerd QtDesignerd4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
-
# Set QT_QTDESIGNERCOMPONENTS_LIBRARY
FIND_LIBRARY(QT_QTDESIGNERCOMPONENTS_LIBRARY_RELEASE NAMES QtDesignerComponents QtDesignerComponents4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
--- 627,630 ----
***************
*** 813,820 ****
FIND_LIBRARY(QT_QTASSISTANTCLIENT_LIBRARY_RELEASE NAMES QtAssistantClient QtAssistantClient4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
FIND_LIBRARY(QT_QTASSISTANTCLIENT_LIBRARY_DEBUG NAMES QtAssistantClient_debug QtAssistantClientd QtAssistantClientd4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
# Set QT_QTHELP_LIBRARY
- 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 QtHelpd 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 QtCLucened QtCLucened4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
--- 642,651 ----
FIND_LIBRARY(QT_QTASSISTANTCLIENT_LIBRARY_RELEASE NAMES QtAssistantClient QtAssistantClient4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
FIND_LIBRARY(QT_QTASSISTANTCLIENT_LIBRARY_DEBUG NAMES QtAssistantClient_debug QtAssistantClientd QtAssistantClientd4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
+
+ # Set QT_QTASSISTANT_LIBRARY
+ FIND_LIBRARY(QT_QTASSISTANT_LIBRARY_RELEASE NAMES QtAssistantClient QtAssistantClient4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
+ FIND_LIBRARY(QT_QTASSISTANT_LIBRARY_DEBUG NAMES QtAssistantClient_debug QtAssistantClientd QtAssistantClientd4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
# Set QT_QTHELP_LIBRARY
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 QtCLucened QtCLucened4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
***************
*** 824,839 ****
ENDIF(Q_WS_MAC AND QT_QTCORE_LIBRARY_RELEASE AND NOT QT_QTCLUCENE_LIBRARY_RELEASE)
- # Set QT_QTWEBKIT_LIBRARY
- FIND_LIBRARY(QT_QTWEBKIT_LIBRARY_RELEASE NAMES QtWebKit QtWebKit4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
- FIND_LIBRARY(QT_QTWEBKIT_LIBRARY_DEBUG NAMES QtWebKit_debug QtWebKitd QtWebKitd4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
-
- # Set QT_QTXMLPATTERNS_LIBRARY
- 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 QtXmlPatternsd 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 phonond phonond4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
-
############################################
#
--- 655,658 ----
***************
*** 872,876 ****
ENDIF (QT_${basename}_LIBRARY_DEBUG AND QT_${basename}_LIBRARY_RELEASE)
! SET(QT_${basename}_LIBRARY ${QT_${basename}_LIBRARY} CACHE FILEPATH "The Qt ${basename} library")
IF (QT_${basename}_LIBRARY)
--- 691,699 ----
ENDIF (QT_${basename}_LIBRARY_DEBUG AND QT_${basename}_LIBRARY_RELEASE)
! IF(QT_QMAKE_CHANGED)
! SET(QT_${basename}_LIBRARY ${QT_${basename}_LIBRARY} CACHE FILEPATH "The Qt ${basename} library" FORCE)
! ELSE(QT_QMAKE_CHANGED)
! SET(QT_${basename}_LIBRARY ${QT_${basename}_LIBRARY} CACHE FILEPATH "The Qt ${basename} library")
! ENDIF(QT_QMAKE_CHANGED)
IF (QT_${basename}_LIBRARY)
***************
*** 914,922 ****
_QT4_ADJUST_LIB_VARS(PHONON)
_QT4_ADJUST_LIB_VARS(QTCLUCENE)
# platform dependent libraries
- IF(Q_WS_X11)
- _QT4_ADJUST_LIB_VARS(QTMOTIF)
- ENDIF(Q_WS_X11)
IF(WIN32)
_QT4_ADJUST_LIB_VARS(QTMAIN)
--- 737,743 ----
_QT4_ADJUST_LIB_VARS(PHONON)
_QT4_ADJUST_LIB_VARS(QTCLUCENE)
+ _QT4_ADJUST_LIB_VARS(QTMOTIF)
# platform dependent libraries
IF(WIN32)
_QT4_ADJUST_LIB_VARS(QTMAIN)
***************
*** 932,950 ****
! # find moc and uic using qmake
! QT_QUERY_QMAKE(QT_MOC_EXECUTABLE_INTERNAL "QMAKE_MOC")
! QT_QUERY_QMAKE(QT_UIC_EXECUTABLE_INTERNAL "QMAKE_UIC")
!
! # make sure we have / and not \ as qmake gives on windows
! FILE(TO_CMAKE_PATH
! "${QT_MOC_EXECUTABLE_INTERNAL}" QT_MOC_EXECUTABLE_INTERNAL)
! # make sure we have / and not \ as qmake gives on windows
! FILE(TO_CMAKE_PATH
! "${QT_UIC_EXECUTABLE_INTERNAL}" QT_UIC_EXECUTABLE_INTERNAL)
!
! SET(QT_MOC_EXECUTABLE
! ${QT_MOC_EXECUTABLE_INTERNAL} CACHE FILEPATH "The moc executable")
! SET(QT_UIC_EXECUTABLE
! ${QT_UIC_EXECUTABLE_INTERNAL} CACHE FILEPATH "The uic executable")
FIND_PROGRAM(QT_UIC3_EXECUTABLE
--- 753,778 ----
! IF(QT_QMAKE_CHANGED)
! SET(QT_MOC_EXECUTABLE NOTFOUND)
! SET(QT_UIC_EXECUTABLE NOTFOUND)
! SET(QT_UIC3_EXECUTABLE NOTFOUND)
! SET(QT_RCC_EXECUTABLE NOTFOUND)
! SET(QT_DBUSCPP2XML_EXECUTABLE NOTFOUND)
! SET(QT_DBUSXML2CPP_EXECUTABLE NOTFOUND)
! SET(QT_LUPDATE_EXECUTABLE NOTFOUND)
! SET(QT_LRELEASE_EXECUTABLE NOTFOUND)
! ENDIF(QT_QMAKE_CHANGED)
!
! FIND_PROGRAM(QT_MOC_EXECUTABLE
! NAMES moc
! PATHS ${QT_BINARY_DIR}
! NO_DEFAULT_PATH
! )
!
! FIND_PROGRAM(QT_UIC_EXECUTABLE
! NAMES uic
! PATHS ${QT_BINARY_DIR}
! NO_DEFAULT_PATH
! )
FIND_PROGRAM(QT_UIC3_EXECUTABLE
***************
*** 1295,1302 ****
MACRO(QT4_CREATE_TRANSLATION _qm_files)
QT4_EXTRACT_OPTIONS(_lupdate_files _lupdate_options ${ARGN})
- MESSAGE("lupdate_files ${_lupdate_files}")
- MESSAGE("lupdate_options ${_lupdate_options}")
SET(_my_sources)
SET(_my_tsfiles)
FOREACH (_file ${_lupdate_files})
GET_FILENAME_COMPONENT(_ext ${_file} EXT)
--- 1123,1130 ----
MACRO(QT4_CREATE_TRANSLATION _qm_files)
QT4_EXTRACT_OPTIONS(_lupdate_files _lupdate_options ${ARGN})
SET(_my_sources)
+ SET(_my_dirs)
SET(_my_tsfiles)
+ SET(_ts_pro)
FOREACH (_file ${_lupdate_files})
GET_FILENAME_COMPONENT(_ext ${_file} EXT)
***************
*** 1305,1316 ****
LIST(APPEND _my_tsfiles ${_abs_FILE})
ELSE(_ext MATCHES "ts")
! LIST(APPEND _my_sources ${_abs_FILE})
ENDIF(_ext MATCHES "ts")
ENDFOREACH(_file)
FOREACH(_ts_file ${_my_tsfiles})
ADD_CUSTOM_COMMAND(OUTPUT ${_ts_file}
COMMAND ${QT_LUPDATE_EXECUTABLE}
! ARGS ${_lupdate_options} ${_my_sources} -ts ${_ts_file}
! DEPENDS ${_my_sources})
ENDFOREACH(_ts_file)
QT4_ADD_TRANSLATION(${_qm_files} ${_my_tsfiles})
--- 1133,1156 ----
LIST(APPEND _my_tsfiles ${_abs_FILE})
ELSE(_ext MATCHES "ts")
! IF(NOT _ext)
! LIST(APPEND _my_dirs ${_abs_FILE})
! ELSE(NOT _ext)
! LIST(APPEND _my_sources ${_abs_FILE})
! ENDIF(NOT _ext)
ENDIF(_ext MATCHES "ts")
ENDFOREACH(_file)
FOREACH(_ts_file ${_my_tsfiles})
+ IF(_my_sources)
+ # make a .pro file to call lupdate on, so we don't make our commands too
+ # long for some systems
+ GET_FILENAME_COMPONENT(_ts_name ${_ts_file} NAME_WE)
+ SET(_ts_pro ${CMAKE_CURRENT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/${_ts_name}_lupdate.pro)
+ STRING(REPLACE ";" " " _pro_srcs "${_my_sources}")
+ FILE(WRITE ${_ts_pro} "SOURCES = ${_pro_srcs}")
+ ENDIF(_my_sources)
ADD_CUSTOM_COMMAND(OUTPUT ${_ts_file}
COMMAND ${QT_LUPDATE_EXECUTABLE}
! ARGS ${_lupdate_options} ${_ts_pro} ${_my_dirs} -ts ${_ts_file}
! DEPENDS ${_my_sources} ${_ts_pro})
ENDFOREACH(_ts_file)
QT4_ADD_TRANSLATION(${_qm_files} ${_my_tsfiles})
***************
*** 1524,1529 ****
ENDIF(QT_QCONFIG MATCHES "openssl" AND NOT Q_WS_WIN)
! ## qdbus
! IF(QT_QCONFIG MATCHES "qdbus")
# if the dbus library isn't found, we'll assume its not required to build
--- 1364,1369 ----
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
***************
*** 1551,1555 ****
ENDIF(NOT QT_DBUS_LIBRARY)
! ENDIF(QT_QCONFIG MATCHES "qdbus")
## glib
--- 1391,1395 ----
ENDIF(NOT QT_DBUS_LIBRARY)
! ENDIF(QT_QCONFIG MATCHES "dbus")
## glib
***************
*** 1575,1587 ****
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} )
!
! 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)
!
MARK_AS_ADVANCED(QT_GLIB_LIBRARY)
MARK_AS_ADVANCED(QT_GTHREAD_LIBRARY)
ENDIF(NOT QT_GLIB_LIBRARY OR NOT QT_GTHREAD_LIBRARY)
ENDIF(QT_QCONFIG MATCHES "glib")
--- 1415,1428 ----
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")
Index: FindMFC.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindMFC.cmake,v
retrieving revision 1.5
retrieving revision 1.5.14.1
diff -C 2 -d -r1.5 -r1.5.14.1
*** FindMFC.cmake 15 Dec 2005 19:17:42 -0000 1.5
--- FindMFC.cmake 24 Oct 2008 15:18:45 -0000 1.5.14.1
***************
*** 1,19 ****
# - Find MFC on Windows
! # Find the native MFC - i.e. decide if this is an MS VC box.
# MFC_FOUND - Was MFC support found
# You don't need to include anything or link anything to use it.
# Assume no MFC support
! SET( MFC_FOUND "NO" )
! # Add MFC support if win32 and not cygwin and not borland
! IF( WIN32 )
! IF( NOT CYGWIN )
! IF( NOT BORLAND )
! IF( NOT MINGW )
! SET( MFC_FOUND "YES" )
! ENDIF( NOT MINGW )
! ENDIF( NOT BORLAND )
! ENDIF( NOT CYGWIN )
! ENDIF( WIN32 )
--- 1,47 ----
# - Find MFC on Windows
! # Find the native MFC - i.e. decide if an application can link to the MFC
! # libraries.
# MFC_FOUND - Was MFC support found
# You don't need to include anything or link anything to use it.
# Assume no MFC support
! SET(MFC_FOUND "NO")
+ # Only attempt the try_compile call if it has a chance to succeed:
+ SET(MFC_ATTEMPT_TRY_COMPILE 0)
+ IF(WIN32 AND NOT UNIX AND NOT BORLAND AND NOT MINGW)
+ SET(MFC_ATTEMPT_TRY_COMPILE 1)
+ ENDIF(WIN32 AND NOT UNIX AND NOT BORLAND AND NOT MINGW)
+
+ IF(MFC_ATTEMPT_TRY_COMPILE)
+ IF("MFC_HAVE_MFC" MATCHES "^MFC_HAVE_MFC$")
+ SET(CHECK_INCLUDE_FILE_VAR "afxwin.h")
+ CONFIGURE_FILE(${CMAKE_ROOT}/Modules/CheckIncludeFile.cxx.in
+ ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/CheckIncludeFile.cxx)
+ MESSAGE(STATUS "Looking for MFC")
+ TRY_COMPILE(MFC_HAVE_MFC
+ ${CMAKE_BINARY_DIR}
+ ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/CheckIncludeFile.cxx
+ CMAKE_FLAGS
+ -DCMAKE_MFC_FLAG:STRING=2
+ -DCOMPILE_DEFINITIONS:STRING=-D_AFXDLL
+ OUTPUT_VARIABLE OUTPUT)
+ IF(MFC_HAVE_MFC)
+ MESSAGE(STATUS "Looking for MFC - found")
+ SET(MFC_HAVE_MFC 1 CACHE INTERNAL "Have MFC?")
+ FILE(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeOutput.log
+ "Determining if MFC exists passed with the following output:\n"
+ "${OUTPUT}\n\n")
+ ELSE(MFC_HAVE_MFC)
+ MESSAGE(STATUS "Looking for MFC - not found")
+ SET(MFC_HAVE_MFC 0 CACHE INTERNAL "Have MFC?")
+ FILE(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeError.log
+ "Determining if MFC exists failed with the following output:\n"
+ "${OUTPUT}\n\n")
+ ENDIF(MFC_HAVE_MFC)
+ ENDIF("MFC_HAVE_MFC" MATCHES "^MFC_HAVE_MFC$")
+ IF(MFC_HAVE_MFC)
+ SET(MFC_FOUND "YES")
+ ENDIF(MFC_HAVE_MFC)
+ ENDIF(MFC_ATTEMPT_TRY_COMPILE)
Index: CMakeASMInformation.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/CMakeASMInformation.cmake,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -C 2 -d -r1.3 -r1.3.2.1
*** CMakeASMInformation.cmake 4 Mar 2008 01:24:18 -0000 1.3
--- CMakeASMInformation.cmake 24 Oct 2008 15:18:44 -0000 1.3.2.1
***************
*** 8,12 ****
SET(CMAKE_INCLUDE_FLAG_ASM${ASM_DIALECT} "-I") # -I
!
GET_FILENAME_COMPONENT(CMAKE_BASE_NAME "${CMAKE_ASM${ASM_DIALECT}_COMPILER}" NAME_WE)
--- 8,12 ----
SET(CMAKE_INCLUDE_FLAG_ASM${ASM_DIALECT} "-I") # -I
! SET(CMAKE_BASE_NAME)
GET_FILENAME_COMPONENT(CMAKE_BASE_NAME "${CMAKE_ASM${ASM_DIALECT}_COMPILER}" NAME_WE)
Index: FindwxWidgets.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindwxWidgets.cmake,v
retrieving revision 1.18.2.4
retrieving revision 1.18.2.5
diff -C 2 -d -r1.18.2.4 -r1.18.2.5
*** FindwxWidgets.cmake 22 Jul 2008 18:04:23 -0000 1.18.2.4
--- FindwxWidgets.cmake 24 Oct 2008 15:18:45 -0000 1.18.2.5
***************
*** 401,404 ****
--- 401,405 ----
wxWidgets-2.9.1
wxWidgets-2.9.0
+ wxWidgets-2.8.9
wxWidgets-2.8.8
wxWidgets-2.8.7
***************
*** 447,451 ****
IF(BUILD_SHARED_LIBS)
FIND_PATH(wxWidgets_LIB_DIR
! NAMES msw/build.cfg mswd/build.cfg
PATHS
${WX_ROOT_DIR}/lib/${WX_LIB_DIR_PREFIX}_dll # prefer shared
--- 448,460 ----
IF(BUILD_SHARED_LIBS)
FIND_PATH(wxWidgets_LIB_DIR
! NAMES
! msw/wx/setup.h
! mswd/wx/setup.h
! mswu/wx/setup.h
! mswud/wx/setup.h
! mswuniv/wx/setup.h
! mswunivd/wx/setup.h
! mswunivu/wx/setup.h
! mswunivud/wx/setup.h
PATHS
${WX_ROOT_DIR}/lib/${WX_LIB_DIR_PREFIX}_dll # prefer shared
***************
*** 456,460 ****
ELSE(BUILD_SHARED_LIBS)
FIND_PATH(wxWidgets_LIB_DIR
! NAMES msw/build.cfg mswd/build.cfg
PATHS
${WX_ROOT_DIR}/lib/${WX_LIB_DIR_PREFIX}_lib # prefer static
--- 465,477 ----
ELSE(BUILD_SHARED_LIBS)
FIND_PATH(wxWidgets_LIB_DIR
! NAMES
! msw/wx/setup.h
! mswd/wx/setup.h
! mswu/wx/setup.h
! mswud/wx/setup.h
! mswuniv/wx/setup.h
! mswunivd/wx/setup.h
! mswunivu/wx/setup.h
! mswunivud/wx/setup.h
PATHS
${WX_ROOT_DIR}/lib/${WX_LIB_DIR_PREFIX}_lib # prefer static
Index: CMakePlatformId.h.in
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/CMakePlatformId.h.in,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C 2 -d -r1.2 -r1.2.2.1
*** CMakePlatformId.h.in 10 Mar 2008 13:32:25 -0000 1.2
--- CMakePlatformId.h.in 24 Oct 2008 15:18:45 -0000 1.2.2.1
***************
*** 36,39 ****
--- 36,45 ----
# define PLATFORM_ID "HP-UX"
+ #elif defined(__HAIKU) || defined(__HAIKU__) || defined(_HAIKU)
+ # define PLATFORM_ID "Haiku"
+ /* Haiku also defines __BEOS__ so we must
+ put it prior to the check for __BEOS__
+ */
+
#elif defined(__BeOS) || defined(__BEOS__) || defined(_BEOS)
# define PLATFORM_ID "BeOS"
Index: FindGLUT.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindGLUT.cmake,v
retrieving revision 1.20
retrieving revision 1.20.2.1
diff -C 2 -d -r1.20 -r1.20.2.1
*** FindGLUT.cmake 13 Mar 2008 14:56:40 -0000 1.20
--- FindGLUT.cmake 24 Oct 2008 15:18:45 -0000 1.20.2.1
***************
*** 12,15 ****
--- 12,16 ----
PATHS ${GLUT_ROOT_PATH}/include )
FIND_LIBRARY( GLUT_glut_LIBRARY NAMES glut glut32
+ PATHS
${OPENGL_LIBRARY_DIR}
${GLUT_ROOT_PATH}/Release
Index: CMakeCXXInformation.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/CMakeCXXInformation.cmake,v
retrieving revision 1.24.2.2
retrieving revision 1.24.2.3
diff -C 2 -d -r1.24.2.2 -r1.24.2.3
*** CMakeCXXInformation.cmake 6 Aug 2008 21:04:18 -0000 1.24.2.2
--- CMakeCXXInformation.cmake 24 Oct 2008 15:18:45 -0000 1.24.2.3
***************
*** 14,18 ****
ENDIF(UNIX)
!
GET_FILENAME_COMPONENT(CMAKE_BASE_NAME ${CMAKE_CXX_COMPILER} NAME_WE)
# since the gnu compiler has several names force g++
--- 14,18 ----
ENDIF(UNIX)
! SET(CMAKE_BASE_NAME)
GET_FILENAME_COMPONENT(CMAKE_BASE_NAME ${CMAKE_CXX_COMPILER} NAME_WE)
# since the gnu compiler has several names force g++
Index: CMakeRCInformation.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/CMakeRCInformation.cmake,v
retrieving revision 1.5.14.1
retrieving revision 1.5.14.2
diff -C 2 -d -r1.5.14.1 -r1.5.14.2
*** CMakeRCInformation.cmake 23 Apr 2008 02:05:39 -0000 1.5.14.1
--- CMakeRCInformation.cmake 24 Oct 2008 15:18:45 -0000 1.5.14.2
***************
*** 4,7 ****
--- 4,9 ----
# if it exists.
+ # make sure we don't use CMAKE_BASE_NAME from somewhere else
+ SET(CMAKE_BASE_NAME)
GET_FILENAME_COMPONENT(CMAKE_BASE_NAME ${CMAKE_RC_COMPILER} NAME_WE)
SET(CMAKE_SYSTEM_AND_RC_COMPILER_INFO_FILE
***************
*** 10,13 ****
--- 12,16 ----
+
SET (CMAKE_RC_FLAGS "$ENV{RCFLAGS} ${CMAKE_RC_FLAGS_INIT}" CACHE STRING
"Flags for Fortran compiler.")
***************
*** 24,28 ****
IF(NOT CMAKE_RC_COMPILE_OBJECT)
SET(CMAKE_RC_COMPILE_OBJECT
! "<CMAKE_RC_COMPILER> <FLAGS> /fo<OBJECT> <SOURCE>")
ENDIF(NOT CMAKE_RC_COMPILE_OBJECT)
--- 27,31 ----
IF(NOT CMAKE_RC_COMPILE_OBJECT)
SET(CMAKE_RC_COMPILE_OBJECT
! "<CMAKE_RC_COMPILER> <FLAGS> <DEFINES> /fo<OBJECT> <SOURCE>")
ENDIF(NOT CMAKE_RC_COMPILE_OBJECT)
Index: CMakeFortranCompilerId.F90.in
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/CMakeFortranCompilerId.F90.in,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C 2 -d -r1.1.2.1 -r1.1.2.2
*** CMakeFortranCompilerId.F90.in 23 May 2008 20:09:34 -0000 1.1.2.1
--- CMakeFortranCompilerId.F90.in 24 Oct 2008 15:18:45 -0000 1.1.2.2
***************
*** 51,54 ****
--- 51,58 ----
#elif defined(__hpux) || defined(__hpux__)
PRINT *, 'INFO:platform[HP-UX]'
+ #elif defined(__HAIKU) || defined(__HAIKU__) || defined(_HAIKU)
+ PRINT *, 'INFO:platform[Haiku]'
+ ! Haiku also defines __BEOS__ so we must
+ ! put it prior to the check for __BEOS__
#elif defined(__BeOS) || defined(__BEOS__) || defined(_BEOS)
PRINT *, 'INFO:platform[BeOS]'
Index: FindBoost.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindBoost.cmake,v
retrieving revision 1.4.2.7
retrieving revision 1.4.2.8
diff -C 2 -d -r1.4.2.7 -r1.4.2.8
*** FindBoost.cmake 22 Sep 2008 14:05:16 -0000 1.4.2.7
--- FindBoost.cmake 24 Oct 2008 15:18:45 -0000 1.4.2.8
***************
*** 95,112 ****
"Use the multithreaded versions of the Boost libraries" ON)
! if (Boost_FIND_VERSION_EXACT)
! if (Boost_FIND_VERSION_PATCH)
! set( _boost_TEST_VERSIONS
! "${Boost_FIND_VERSION_MAJOR}.${Boost_FIND_VERSION_MINOR}.${Boost_FIND_VERSION_PATCH}")
! else (Boost_FIND_VERSION_PATCH)
! set( _boost_TEST_VERSIONS
! "${Boost_FIND_VERSION_MAJOR}.${Boost_FIND_VERSION_MINOR}.0"
! "${Boost_FIND_VERSION_MAJOR}.${Boost_FIND_VERSION_MINOR}")
! endif (Boost_FIND_VERSION_PATCH)
! else (Boost_FIND_VERSION_EXACT)
! set( _boost_TEST_VERSIONS ${Boost_ADDITIONAL_VERSIONS}
! "1.36.1" "1.36.0" "1.36" "1.35.1" "1.35.0" "1.35" "1.34.1" "1.34.0"
! "1.34" "1.33.1" "1.33.0" "1.33" )
! endif (Boost_FIND_VERSION_EXACT)
# The reason that we failed to find Boost. This will be set to a
--- 95,129 ----
"Use the multithreaded versions of the Boost libraries" ON)
! if(Boost_FIND_VERSION_EXACT)
! # The version may appear in a directory with or without the patch
! # level, even when the patch level is non-zero.
! set(_boost_TEST_VERSIONS
! "${Boost_FIND_VERSION_MAJOR}.${Boost_FIND_VERSION_MINOR}.${Boost_FIND_VERSION_PATCH}"
! "${Boost_FIND_VERSION_MAJOR}.${Boost_FIND_VERSION_MINOR}")
! else(Boost_FIND_VERSION_EXACT)
! # The user has not requested an exact version. Among known
! # versions, find those that are acceptable to the user request.
! set(_Boost_KNOWN_VERSIONS ${Boost_ADDITIONAL_VERSIONS}
! "1.36.1" "1.36.0" "1.36" "1.35.1" "1.35.0" "1.35" "1.34.1" "1.34.0"
! "1.34" "1.33.1" "1.33.0" "1.33")
! set(_boost_TEST_VERSIONS)
! if(Boost_FIND_VERSION)
! set(_Boost_FIND_VERSION_SHORT "${Boost_FIND_VERSION_MAJOR}.${Boost_FIND_VERSION_MINOR}")
! # Select acceptable versions.
! foreach(version ${_Boost_KNOWN_VERSIONS})
! if(NOT "${version}" VERSION_LESS "${Boost_FIND_VERSION}")
! # This version is high enough.
! list(APPEND _boost_TEST_VERSIONS "${version}")
! elseif("${version}.99" VERSION_EQUAL "${_Boost_FIND_VERSION_SHORT}.99")
! # This version is a short-form for the requested version with
! # the patch level dropped.
! list(APPEND _boost_TEST_VERSIONS "${version}")
! endif()
! endforeach(version)
! else(Boost_FIND_VERSION)
! # Any version is acceptable.
! set(_boost_TEST_VERSIONS "${_Boost_KNOWN_VERSIONS}")
! endif(Boost_FIND_VERSION)
! endif(Boost_FIND_VERSION_EXACT)
# The reason that we failed to find Boost. This will be set to a
More information about the Cmake-commits
mailing list