[Cmake-commits] [cmake-commits] hoffman committed CMakeTestFortranCompiler.cmake 1.8 1.8.12.1 FindBoost.cmake 1.4.2.2 1.4.2.3 FindCurses.cmake 1.10.2.2 1.10.2.3 FindPackageHandleStandardArgs.cmake 1.4.2.1 1.4.2.2 FindQt4.cmake 1.96.2.8 1.96.2.9 NSIS.template.in 1.25 1.25.2.1
cmake-commits at cmake.org
cmake-commits at cmake.org
Thu May 15 15:39:52 EDT 2008
Update of /cvsroot/CMake/CMake/Modules
In directory public:/mounts/ram/cvs-serv17340/Modules
Modified Files:
Tag: CMake-2-6
CMakeTestFortranCompiler.cmake FindBoost.cmake
FindCurses.cmake FindPackageHandleStandardArgs.cmake
FindQt4.cmake NSIS.template.in
Log Message:
ENH: merge in from main tree
Index: NSIS.template.in
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/NSIS.template.in,v
retrieving revision 1.25
retrieving revision 1.25.2.1
diff -C 2 -d -r1.25 -r1.25.2.1
*** NSIS.template.in 29 Oct 2007 12:11:44 -0000 1.25
--- NSIS.template.in 15 May 2008 19:39:50 -0000 1.25.2.1
***************
*** 527,531 ****
!insertmacro MUI_INSTALLOPTIONS_READ $ADD_TO_PATH_ALL_USERS "NSIS.InstallOptions.ini" "Field 3" "State"
!insertmacro MUI_INSTALLOPTIONS_READ $ADD_TO_PATH_CURRENT_USER "NSIS.InstallOptions.ini" "Field 4" "State"
! StrCmp $DO_NOT_ADD_TO_PATH "1" doNotAddToPath 0
Call AddToPath
doNotAddToPath:
--- 527,532 ----
!insertmacro MUI_INSTALLOPTIONS_READ $ADD_TO_PATH_ALL_USERS "NSIS.InstallOptions.ini" "Field 3" "State"
!insertmacro MUI_INSTALLOPTIONS_READ $ADD_TO_PATH_CURRENT_USER "NSIS.InstallOptions.ini" "Field 4" "State"
! StrCmp "@CPACK_NSIS_MODIFY_PATH@" "ON" 0 doNotAddToPath
! StrCmp $DO_NOT_ADD_TO_PATH "1" doNotAddToPath 0
Call AddToPath
doNotAddToPath:
Index: FindCurses.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindCurses.cmake,v
retrieving revision 1.10.2.2
retrieving revision 1.10.2.3
diff -C 2 -d -r1.10.2.2 -r1.10.2.3
*** FindCurses.cmake 1 May 2008 16:35:38 -0000 1.10.2.2
--- FindCurses.cmake 15 May 2008 19:39:49 -0000 1.10.2.3
***************
*** 13,17 ****
# functionality is required.
! FIND_LIBRARY(CURSES_LIBRARY NAMES curses )
FIND_LIBRARY(CURSES_NCURSES_LIBRARY NAMES ncurses )
--- 13,17 ----
# functionality is required.
! FIND_LIBRARY(CURSES_CURSES_LIBRARY NAMES curses )
FIND_LIBRARY(CURSES_NCURSES_LIBRARY NAMES ncurses )
***************
*** 19,25 ****
SET(CURSES_USE_NCURSES FALSE)
! IF(CURSES_NCURSES_LIBRARY AND NOT CURSES_LIBRARY)
SET(CURSES_USE_NCURSES TRUE)
! ENDIF(CURSES_NCURSES_LIBRARY AND NOT CURSES_LIBRARY)
--- 19,25 ----
SET(CURSES_USE_NCURSES FALSE)
! IF(CURSES_NCURSES_LIBRARY AND NOT CURSES_CURSES_LIBRARY)
SET(CURSES_USE_NCURSES TRUE)
! ENDIF(CURSES_NCURSES_LIBRARY AND NOT CURSES_CURSES_LIBRARY)
***************
*** 35,41 ****
# prefix as the library was found, if still not found, try curses.h with the
# default search paths.
! IF(CURSES_LIBRARY AND CURSES_NEED_NCURSES)
INCLUDE(CheckLibraryExists)
! CHECK_LIBRARY_EXISTS("${CURSES_LIBRARY}" wsyncup "" CURSES_CURSES_HAS_WSYNCUP)
IF(CURSES_NCURSES_LIBRARY AND NOT CURSES_CURSES_HAS_WSYNCUP)
--- 35,41 ----
# prefix as the library was found, if still not found, try curses.h with the
# default search paths.
! IF(CURSES_CURSES_LIBRARY AND CURSES_NEED_NCURSES)
INCLUDE(CheckLibraryExists)
! CHECK_LIBRARY_EXISTS("${CURSES_CURSES_LIBRARY}" wsyncup "" CURSES_CURSES_HAS_WSYNCUP)
IF(CURSES_NCURSES_LIBRARY AND NOT CURSES_CURSES_HAS_WSYNCUP)
***************
*** 46,58 ****
ENDIF(CURSES_NCURSES_LIBRARY AND NOT CURSES_CURSES_HAS_WSYNCUP)
! ENDIF(CURSES_LIBRARY AND CURSES_NEED_NCURSES)
IF(NOT CURSES_USE_NCURSES)
FIND_FILE(CURSES_HAVE_CURSES_H curses.h )
! FIND_PATH(CURSES_INCLUDE_PATH curses.h )
!
! GET_FILENAME_COMPONENT(_cursesLibDir "${CURSES_LIBRARY}" PATH)
GET_FILENAME_COMPONENT(_cursesParentDir "${_cursesLibDir}" PATH)
ELSE(NOT CURSES_USE_NCURSES)
# we need to find ncurses
--- 46,62 ----
ENDIF(CURSES_NCURSES_LIBRARY AND NOT CURSES_CURSES_HAS_WSYNCUP)
! ENDIF(CURSES_CURSES_LIBRARY AND CURSES_NEED_NCURSES)
IF(NOT CURSES_USE_NCURSES)
FIND_FILE(CURSES_HAVE_CURSES_H curses.h )
! FIND_PATH(CURSES_CURSES_H_PATH curses.h )
! GET_FILENAME_COMPONENT(_cursesLibDir "${CURSES_CURSES_LIBRARY}" PATH)
GET_FILENAME_COMPONENT(_cursesParentDir "${_cursesLibDir}" PATH)
+
+ # for compatibility with older FindCurses.cmake this has to be in the cache
+ # FORCE must not be used since this would break builds which preload a cache wqith these variables set
+ SET(CURSES_INCLUDE_PATH "${CURSES_CURSES_H_PATH}" CACHE FILEPATH "The curses include path")
+ SET(CURSES_LIBRARY "${CURSES_CURSES_LIBRARY}" CACHE FILEPATH "The curses library")
ELSE(NOT CURSES_USE_NCURSES)
# we need to find ncurses
***************
*** 70,82 ****
FIND_PATH(CURSES_NCURSES_INCLUDE_PATH curses.h)
! SET(CURSES_INCLUDE_PATH "${CURSES_NCURSES_INCLUDE_PATH}")
! SET(FORCE_ARG "")
! IF("${CURSES_LIBRARY}" STREQUAL "CURSES_LIBRARY-NOTFOUND")
! SET(FORCE_ARG "FORCE")
! ENDIF("${CURSES_LIBRARY}" STREQUAL "CURSES_LIBRARY-NOTFOUND")
! SET(CURSES_LIBRARY "${CURSES_NCURSES_LIBRARY}" CACHE FILEPATH "path to curses" ${FORCE_ARG})
ENDIF(NOT CURSES_USE_NCURSES)
FIND_LIBRARY(CURSES_EXTRA_LIBRARY cur_colr PATHS "${_cursesLibDir}" NO_DEFAULT_PATH)
FIND_LIBRARY(CURSES_EXTRA_LIBRARY cur_colr )
--- 74,85 ----
FIND_PATH(CURSES_NCURSES_INCLUDE_PATH curses.h)
! # for compatibility with older FindCurses.cmake this has to be in the cache
! # FORCE must not be used since this would break builds which preload a cache wqith these variables set
! SET(CURSES_INCLUDE_PATH "${CURSES_NCURSES_INCLUDE_PATH}" CACHE FILEPATH "The curses include path")
! SET(CURSES_LIBRARY "${CURSES_NCURSES_LIBRARY}" CACHE FILEPATH "The curses library")
ENDIF(NOT CURSES_USE_NCURSES)
+
FIND_LIBRARY(CURSES_EXTRA_LIBRARY cur_colr PATHS "${_cursesLibDir}" NO_DEFAULT_PATH)
FIND_LIBRARY(CURSES_EXTRA_LIBRARY cur_colr )
***************
*** 85,88 ****
--- 88,96 ----
FIND_LIBRARY(CURSES_FORM_LIBRARY form )
+ # for compatibility with older FindCurses.cmake this has to be in the cache
+ # FORCE must not be used since this would break builds which preload a cache wqith these variables set
+ SET(FORM_LIBRARY "${CURSES_FORM_LIBRARY}" CACHE FILEPATH "The curses form library")
+
+
# Need to provide the *_LIBRARIES
SET(CURSES_LIBRARIES ${CURSES_LIBRARY})
***************
*** 104,115 ****
FIND_PACKAGE_HANDLE_STANDARD_ARGS(Curses DEFAULT_MSG CURSES_LIBRARY CURSES_INCLUDE_PATH)
- # for compatibility
- SET(FORM_LIBRARY "${CURSES_FORM_LIBRARY}")
-
MARK_AS_ADVANCED(
CURSES_INCLUDE_PATH
CURSES_LIBRARY
CURSES_CURSES_INCLUDE_PATH
! CURSES_LIBRARY
CURSES_NCURSES_INCLUDE_PATH
CURSES_NCURSES_LIBRARY
--- 112,120 ----
FIND_PACKAGE_HANDLE_STANDARD_ARGS(Curses DEFAULT_MSG CURSES_LIBRARY CURSES_INCLUDE_PATH)
MARK_AS_ADVANCED(
CURSES_INCLUDE_PATH
CURSES_LIBRARY
CURSES_CURSES_INCLUDE_PATH
! CURSES_CURSES_LIBRARY
CURSES_NCURSES_INCLUDE_PATH
CURSES_NCURSES_LIBRARY
Index: FindQt4.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindQt4.cmake,v
retrieving revision 1.96.2.8
retrieving revision 1.96.2.9
diff -C 2 -d -r1.96.2.8 -r1.96.2.9
*** FindQt4.cmake 4 May 2008 22:07:27 -0000 1.96.2.8
--- FindQt4.cmake 15 May 2008 19:39:49 -0000 1.96.2.9
***************
*** 795,798 ****
--- 795,802 ----
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)
+ # QtCLucene not with other frameworks with binary installation (in /usr/lib)
+ IF(Q_WS_MAC AND QT_QTCORE_LIBRARY_RELEASE AND NOT QT_QTCLUCENE_LIBRARY_RELEASE)
+ FIND_LIBRARY(QT_QTCLUCENE_LIBRARY_RELEASE NAMES QtCLucene PATHS ${QT_LIBRARY_DIR})
+ ENDIF(Q_WS_MAC AND QT_QTCORE_LIBRARY_RELEASE AND NOT QT_QTCLUCENE_LIBRARY_RELEASE)
# Set QT_QTWEBKIT_LIBRARY
Index: CMakeTestFortranCompiler.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/CMakeTestFortranCompiler.cmake,v
retrieving revision 1.8
retrieving revision 1.8.12.1
diff -C 2 -d -r1.8 -r1.8.12.1
*** CMakeTestFortranCompiler.cmake 14 Jun 2006 16:28:29 -0000 1.8
--- CMakeTestFortranCompiler.cmake 15 May 2008 19:39:49 -0000 1.8.12.1
***************
*** 39,44 ****
IF(CMAKE_Fortran_COMPILER_WORKS)
# Test for Fortran 90 support by using an f90-specific construct.
! IF(DEFINED CMAKE_Fortran_COMPILER_SUPPORTS_F90)
! ELSE(DEFINED CMAKE_Fortran_COMPILER_SUPPORTS_F90)
MESSAGE(STATUS "Checking whether ${CMAKE_Fortran_COMPILER} supports Fortran 90")
FILE(WRITE ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/testFortranCompilerF90.f90 "
--- 39,43 ----
IF(CMAKE_Fortran_COMPILER_WORKS)
# Test for Fortran 90 support by using an f90-specific construct.
! IF(NOT DEFINED CMAKE_Fortran_COMPILER_SUPPORTS_F90)
MESSAGE(STATUS "Checking whether ${CMAKE_Fortran_COMPILER} supports Fortran 90")
FILE(WRITE ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/testFortranCompilerF90.f90 "
***************
*** 63,66 ****
SET(CMAKE_Fortran_COMPILER_SUPPORTS_F90 0 CACHE INTERNAL "")
ENDIF(CMAKE_Fortran_COMPILER_SUPPORTS_F90)
! ENDIF(DEFINED CMAKE_Fortran_COMPILER_SUPPORTS_F90)
ENDIF(CMAKE_Fortran_COMPILER_WORKS)
--- 62,65 ----
SET(CMAKE_Fortran_COMPILER_SUPPORTS_F90 0 CACHE INTERNAL "")
ENDIF(CMAKE_Fortran_COMPILER_SUPPORTS_F90)
! ENDIF(NOT DEFINED CMAKE_Fortran_COMPILER_SUPPORTS_F90)
ENDIF(CMAKE_Fortran_COMPILER_WORKS)
Index: FindPackageHandleStandardArgs.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindPackageHandleStandardArgs.cmake,v
retrieving revision 1.4.2.1
retrieving revision 1.4.2.2
diff -C 2 -d -r1.4.2.1 -r1.4.2.2
*** FindPackageHandleStandardArgs.cmake 18 Mar 2008 14:23:51 -0000 1.4.2.1
--- FindPackageHandleStandardArgs.cmake 15 May 2008 19:39:49 -0000 1.4.2.2
***************
*** 29,36 ****
--- 29,40 ----
STRING(TOUPPER ${_NAME} _NAME_UPPER)
+ # collect all variables which were not found, so they can be printed, so the
+ # user knows better what went wrong (#6375)
+ SET(MISSING_VARS "")
SET(DETAILS "")
SET(${_NAME_UPPER}_FOUND TRUE)
IF(NOT ${_VAR1})
SET(${_NAME_UPPER}_FOUND FALSE)
+ SET(MISSING_VARS " ${_VAR1}")
ELSE(NOT ${_VAR1})
SET(DETAILS "${DETAILS}[${${_VAR1}}]")
***************
*** 41,44 ****
--- 45,49 ----
IF(NOT ${_CURRENT_VAR})
SET(${_NAME_UPPER}_FOUND FALSE)
+ SET(MISSING_VARS "${MISSING_VARS} ${_CURRENT_VAR}")
ELSE(NOT ${_CURRENT_VAR})
SET(DETAILS "${DETAILS}[${${_CURRENT_VAR}}]")
***************
*** 50,57 ****
ELSE (${_NAME_UPPER}_FOUND)
IF (${_NAME}_FIND_REQUIRED)
! MESSAGE(FATAL_ERROR "${_FAIL_MESSAGE}")
ELSE (${_NAME}_FIND_REQUIRED)
IF (NOT ${_NAME}_FIND_QUIETLY)
! MESSAGE(STATUS "${_FAIL_MESSAGE}")
ENDIF (NOT ${_NAME}_FIND_QUIETLY)
ENDIF (${_NAME}_FIND_REQUIRED)
--- 55,62 ----
ELSE (${_NAME_UPPER}_FOUND)
IF (${_NAME}_FIND_REQUIRED)
! MESSAGE(FATAL_ERROR "${_FAIL_MESSAGE} (missing: ${MISSING_VARS})")
ELSE (${_NAME}_FIND_REQUIRED)
IF (NOT ${_NAME}_FIND_QUIETLY)
! MESSAGE(STATUS "${_FAIL_MESSAGE} (missing: ${MISSING_VARS})")
ENDIF (NOT ${_NAME}_FIND_QUIETLY)
ENDIF (${_NAME}_FIND_REQUIRED)
Index: FindBoost.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindBoost.cmake,v
retrieving revision 1.4.2.2
retrieving revision 1.4.2.3
diff -C 2 -d -r1.4.2.2 -r1.4.2.3
*** FindBoost.cmake 1 May 2008 16:35:38 -0000 1.4.2.2
--- FindBoost.cmake 15 May 2008 19:39:49 -0000 1.4.2.3
***************
*** 476,490 ****
IF(Boost_INCLUDE_DIR)
SET( Boost_FOUND TRUE )
! IF( Boost_FIND_VERSION_MAJOR AND Boost_VERSION_MAJOR LESS "${Boost_FIND_VERSION_MAJOR}" )
SET( Boost_FOUND FALSE )
! ELSE( Boost_FIND_VERSION_MAJOR AND Boost_VERSION_MAJOR LESS "${Boost_FIND_VERSION_MAJOR}" )
! IF( Boost_FIND_VERSION_MINOR AND Boost_VERSION_MINOR LESS "${Boost_FIND_VERSION_MINOR}" )
SET( Boost_FOUND FALSE )
! ELSE( Boost_FIND_VERSION_MINOR AND Boost_VERSION_MINOR LESS "${Boost_FIND_VERSION_MINOR}" )
! IF( Boost_FIND_VERSION_PATCH AND Boost_VERSION_SUBMINOR LESS "${Boost_FIND_VERSION_PATCH}" )
SET( Boost_FOUND FALSE )
! ENDIF( Boost_FIND_VERSION_PATCH AND Boost_VERSION_SUBMINOR LESS "${Boost_FIND_VERSION_PATCH}" )
! ENDIF( Boost_FIND_VERSION_MINOR AND Boost_VERSION_MINOR LESS "${Boost_FIND_VERSION_MINOR}" )
! ENDIF( Boost_FIND_VERSION_MAJOR AND Boost_VERSION_MAJOR LESS "${Boost_FIND_VERSION_MAJOR}" )
set(_boost_CHECKED_COMPONENT FALSE)
FOREACH(COMPONENT ${Boost_FIND_COMPONENTS})
--- 476,490 ----
IF(Boost_INCLUDE_DIR)
SET( Boost_FOUND TRUE )
! IF( Boost_FIND_VERSION_MAJOR AND Boost_MAJOR_VERSION LESS "${Boost_FIND_VERSION_MAJOR}" )
SET( Boost_FOUND FALSE )
! ELSE( Boost_FIND_VERSION_MAJOR AND Boost_MAJOR_VERSION LESS "${Boost_FIND_VERSION_MAJOR}" )
! IF( Boost_FIND_VERSION_MINOR AND Boost_MINOR_VERSION LESS "${Boost_FIND_VERSION_MINOR}" )
SET( Boost_FOUND FALSE )
! ELSE( Boost_FIND_VERSION_MINOR AND Boost_MINOR_VERSION LESS "${Boost_FIND_VERSION_MINOR}" )
! IF( Boost_FIND_VERSION_PATCH AND Boost_SUBMINOR_VERSION LESS "${Boost_FIND_VERSION_PATCH}" )
SET( Boost_FOUND FALSE )
! ENDIF( Boost_FIND_VERSION_PATCH AND Boost_SUBMINOR_VERSION LESS "${Boost_FIND_VERSION_PATCH}" )
! ENDIF( Boost_FIND_VERSION_MINOR AND Boost_MINOR_VERSION LESS "${Boost_FIND_VERSION_MINOR}" )
! ENDIF( Boost_FIND_VERSION_MAJOR AND Boost_MAJOR_VERSION LESS "${Boost_FIND_VERSION_MAJOR}" )
set(_boost_CHECKED_COMPONENT FALSE)
FOREACH(COMPONENT ${Boost_FIND_COMPONENTS})
***************
*** 550,554 ****
ELSE (Boost_FOUND)
IF (Boost_FIND_REQUIRED)
! MESSAGE(STATUS "Boost version required: ${Boost_FIND_VERSION}. Found: ${Boost_MAJOR_VERSION}.${Boost_MINOR_VERSION}.${Boost_SUBMINOR_VERSION}")
MESSAGE(FATAL_ERROR "Couldn't find the Boost libraries and/or include directory, or the version found is too old. Please install the Boost libraries AND development packages. You can set BOOST_ROOT, BOOST_INCLUDEDIR and BOOST_LIBRARYDIR to help find Boost.")
ENDIF(Boost_FIND_REQUIRED)
--- 550,554 ----
ELSE (Boost_FOUND)
IF (Boost_FIND_REQUIRED)
! MESSAGE(STATUS "Boost version required: ${Boost_FIND_VERSION_MAJOR}.${Boost_FIND_VERSION_MINOR}.${Boost_FIND_VERSION_PATCH}, found: ${Boost_MAJOR_VERSION}.${Boost_MINOR_VERSION}.${Boost_SUBMINOR_VERSION}")
MESSAGE(FATAL_ERROR "Couldn't find the Boost libraries and/or include directory, or the version found is too old. Please install the Boost libraries AND development packages. You can set BOOST_ROOT, BOOST_INCLUDEDIR and BOOST_LIBRARYDIR to help find Boost.")
ENDIF(Boost_FIND_REQUIRED)
More information about the Cmake-commits
mailing list