[Cmake-commits] [cmake-commits] hoffman committed CheckTypeSize.cmake 1.30 1.30.2.1 FindBoost.cmake 1.4.2.1 1.4.2.2 FindCurses.cmake 1.10.2.1 1.10.2.2 FindKDE.cmake 1.3 NONE FindSDL.cmake 1.14 1.14.2.1 FindSDL_sound.cmake 1.7 1.7.2.1 FindVTK.cmake 1.28 1.28.12.1
cmake-commits at cmake.org
cmake-commits at cmake.org
Thu May 1 12:35:40 EDT 2008
Update of /cvsroot/CMake/CMake/Modules
In directory public:/mounts/ram/cvs-serv1008/Modules
Modified Files:
Tag: CMake-2-6
CheckTypeSize.cmake FindBoost.cmake FindCurses.cmake
FindSDL.cmake FindSDL_sound.cmake FindVTK.cmake
Removed Files:
Tag: CMake-2-6
FindKDE.cmake
Log Message:
ENH: merge from cvs create yikes RC 10! (I hope this is the last RC...)
Index: FindCurses.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindCurses.cmake,v
retrieving revision 1.10.2.1
retrieving revision 1.10.2.2
diff -C 2 -d -r1.10.2.1 -r1.10.2.2
*** FindCurses.cmake 30 Mar 2008 13:09:20 -0000 1.10.2.1
--- FindCurses.cmake 1 May 2008 16:35:38 -0000 1.10.2.2
***************
*** 71,75 ****
SET(CURSES_INCLUDE_PATH "${CURSES_NCURSES_INCLUDE_PATH}")
! SET(CURSES_LIBRARY "${CURSES_NCURSES_LIBRARY}" CACHE FILEPATH "path to curses")
ENDIF(NOT CURSES_USE_NCURSES)
--- 71,79 ----
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)
Index: CheckTypeSize.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/CheckTypeSize.cmake,v
retrieving revision 1.30
retrieving revision 1.30.2.1
diff -C 2 -d -r1.30 -r1.30.2.1
*** CheckTypeSize.cmake 10 Aug 2007 17:14:00 -0000 1.30
--- CheckTypeSize.cmake 1 May 2008 16:35:38 -0000 1.30.2.1
***************
*** 1,8 ****
# - Check sizeof a type
! # CHECK_TYPE_SIZE(TYPE VARIABLE)
# Check if the type exists and determine size of type. if the type
! # exists, the size will be stored to the variable.
# VARIABLE - variable to store size if the type exists.
# HAVE_${VARIABLE} - does the variable exists or not
# The following variables may be set before calling this macro to
# modify the way the check is run:
--- 1,15 ----
# - Check sizeof a type
! # CHECK_TYPE_SIZE(TYPE VARIABLE [BUILTIN_TYPES_ONLY])
# Check if the type exists and determine size of type. if the type
! # exists, the size will be stored to the variable. This also
! # calls check_include_file for sys/types.h stdint.h
! # and stddef.h, setting HAVE_SYS_TYPES_H, HAVE_STDINT_H,
! # and HAVE_STDDEF_H. This is because many types are stored
! # in these include files.
# VARIABLE - variable to store size if the type exists.
# HAVE_${VARIABLE} - does the variable exists or not
+ # BUILTIN_TYPES_ONLY - The third argument is optional and if
+ # it is set to the string BUILTIN_TYPES_ONLY
+ # this macro will not check for any header files.
# The following variables may be set before calling this macro to
# modify the way the check is run:
***************
*** 13,17 ****
--- 20,35 ----
# CMAKE_REQUIRED_LIBRARIES = list of libraries to link
+ # These variables are referenced in CheckTypeSizeC.c so we have
+ # to check for them.
+
+ include(CheckIncludeFile)
+
MACRO(CHECK_TYPE_SIZE TYPE VARIABLE)
+ IF(NOT "${ARGV2}" STREQUAL "BUILTIN_TYPES_ONLY")
+ check_include_file(sys/types.h HAVE_SYS_TYPES_H)
+ check_include_file(stdint.h HAVE_STDINT_H)
+ check_include_file(stddef.h HAVE_STDDEF_H)
+ ENDIF(NOT "${ARGV2}" STREQUAL "BUILTIN_TYPES_ONLY")
+
IF("HAVE_${VARIABLE}" MATCHES "^HAVE_${VARIABLE}$")
MESSAGE(STATUS "Check size of ${TYPE}")
Index: FindSDL_sound.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindSDL_sound.cmake,v
retrieving revision 1.7
retrieving revision 1.7.2.1
diff -C 2 -d -r1.7 -r1.7.2.1
*** FindSDL_sound.cmake 21 Dec 2007 01:59:44 -0000 1.7
--- FindSDL_sound.cmake 1 May 2008 16:35:38 -0000 1.7.2.1
***************
*** 271,275 ****
/opt/lib
)
- SET(TEMP_SDLSOUND_FIND_VORBIS_FRAMEWORK "" CACHE INTERNAL "")
IF(VORBIS_LIBRARY)
SET(SDL_SOUND_LIBRARIES_TMP ${SDL_SOUND_LIBRARIES_TMP} ${VORBIS_LIBRARY})
--- 271,274 ----
Index: FindSDL.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindSDL.cmake,v
retrieving revision 1.14
retrieving revision 1.14.2.1
diff -C 2 -d -r1.14 -r1.14.2.1
*** FindSDL.cmake 16 Jan 2008 02:20:11 -0000 1.14
--- FindSDL.cmake 1 May 2008 16:35:38 -0000 1.14.2.1
***************
*** 184,188 ****
SET(SDL_LIBRARY ${SDL_LIBRARY_TEMP} CACHE STRING "Where the SDL Library can be found")
# Set the temp variable to INTERNAL so it is not seen in the CMake GUI
! SET(SDL_LIBRARY_TEMP "" CACHE INTERNAL "")
SET(SDL_FOUND "YES")
--- 184,188 ----
SET(SDL_LIBRARY ${SDL_LIBRARY_TEMP} CACHE STRING "Where the SDL Library can be found")
# Set the temp variable to INTERNAL so it is not seen in the CMake GUI
! SET(SDL_LIBRARY_TEMP "${SDL_LIBRARY_TEMP}" CACHE INTERNAL "")
SET(SDL_FOUND "YES")
--- FindKDE.cmake DELETED ---
Index: FindVTK.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindVTK.cmake,v
retrieving revision 1.28
retrieving revision 1.28.12.1
diff -C 2 -d -r1.28 -r1.28.12.1
*** FindVTK.cmake 23 May 2006 14:40:40 -0000 1.28
--- FindVTK.cmake 1 May 2008 16:35:38 -0000 1.28.12.1
***************
*** 131,140 ****
ELSE(VTK_FOUND)
# VTK not found, explain to the user how to specify its location.
! IF(NOT VTK_FIND_QUIETLY)
MESSAGE(FATAL_ERROR ${VTK_DIR_MESSAGE})
! ELSE(NOT VTK_FIND_QUIETLY)
! IF(VTK_FIND_REQUIRED)
! MESSAGE(FATAL_ERROR ${VTK_DIR_MESSAGE})
! ENDIF(VTK_FIND_REQUIRED)
! ENDIF(NOT VTK_FIND_QUIETLY)
ENDIF(VTK_FOUND)
--- 131,140 ----
ELSE(VTK_FOUND)
# VTK not found, explain to the user how to specify its location.
! IF(VTK_FIND_REQUIRED)
MESSAGE(FATAL_ERROR ${VTK_DIR_MESSAGE})
! ELSE(VTK_FIND_REQUIRED)
! IF(NOT VTK_FIND_QUIETLY)
! MESSAGE(STATUS ${VTK_DIR_MESSAGE})
! ENDIF(NOT VTK_FIND_QUIETLY)
! ENDIF(VTK_FIND_REQUIRED)
ENDIF(VTK_FOUND)
Index: FindBoost.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindBoost.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
*** FindBoost.cmake 23 Apr 2008 02:05:39 -0000 1.4.2.1
--- FindBoost.cmake 1 May 2008 16:35:38 -0000 1.4.2.2
***************
*** 94,98 ****
# this module required CMake 2.5 for the Boost_FIND_VERSION stuff
! CMAKE_MINIMUM_REQUIRED(VERSION "2.6" FATAL_ERROR)
# MESSAGE(STATUS "Finding Boost libraries.... ")
--- 94,102 ----
# this module required CMake 2.5 for the Boost_FIND_VERSION stuff
!
! # this must not be done in find modules, it changes the policy settings, which may have been
! # set in the projects cmake files.
! # beside that this module comes with cmake, so the cmake version is always correct, Alex
! # CMAKE_MINIMUM_REQUIRED(VERSION "2.6" FATAL_ERROR)
# MESSAGE(STATUS "Finding Boost libraries.... ")
More information about the Cmake-commits
mailing list