[Cmake-commits] [cmake-commits] hoffman committed CMakeCInformation.cmake 1.20.2.1 1.20.2.2 CMakeCXXInformation.cmake 1.24.2.1 1.24.2.2 CMakeFortranInformation.cmake 1.18.2.2 1.18.2.3 FindImageMagick.cmake 1.4.14.1 1.4.14.2 FindKDE3.cmake 1.10.2.2 1.10.2.3
cmake-commits at cmake.org
cmake-commits at cmake.org
Wed Aug 6 17:04:21 EDT 2008
Update of /cvsroot/CMake/CMake/Modules
In directory public:/mounts/ram/cvs-serv12802/Modules
Modified Files:
Tag: CMake-2-6
CMakeCInformation.cmake CMakeCXXInformation.cmake
CMakeFortranInformation.cmake FindImageMagick.cmake
FindKDE3.cmake
Log Message:
ENH: merge in fixes from main tree 2.6.2 RC 1
Index: CMakeCXXInformation.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/CMakeCXXInformation.cmake,v
retrieving revision 1.24.2.1
retrieving revision 1.24.2.2
diff -C 2 -d -r1.24.2.1 -r1.24.2.2
*** CMakeCXXInformation.cmake 21 Apr 2008 19:21:56 -0000 1.24.2.1
--- CMakeCXXInformation.cmake 6 Aug 2008 21:04:18 -0000 1.24.2.2
***************
*** 177,181 ****
# CMAKE_CXX_CREATE_SHARED_LIBRARY
# CMAKE_CXX_CREATE_SHARED_MODULE
- # CMAKE_CXX_CREATE_STATIC_LIBRARY
# CMAKE_CXX_COMPILE_OBJECT
# CMAKE_CXX_LINK_EXECUTABLE
--- 177,180 ----
***************
*** 213,222 ****
! # create a C++ static library
! IF(NOT CMAKE_CXX_CREATE_STATIC_LIBRARY)
! SET(CMAKE_CXX_CREATE_STATIC_LIBRARY
! "<CMAKE_AR> cr <TARGET> <LINK_FLAGS> <OBJECTS> "
! "<CMAKE_RANLIB> <TARGET> ")
! ENDIF(NOT CMAKE_CXX_CREATE_STATIC_LIBRARY)
# compile a C++ file into an object file
--- 212,220 ----
! # Create a static archive incrementally for large object file counts.
! # If CMAKE_CXX_CREATE_STATIC_LIBRARY is set it will override these.
! SET(CMAKE_CXX_ARCHIVE_CREATE "<CMAKE_AR> cr <TARGET> <LINK_FLAGS> <OBJECTS>")
! SET(CMAKE_CXX_ARCHIVE_APPEND "<CMAKE_AR> r <TARGET> <LINK_FLAGS> <OBJECTS>")
! SET(CMAKE_CXX_ARCHIVE_FINISH "<CMAKE_RANLIB> <TARGET>")
# compile a C++ file into an object file
Index: CMakeCInformation.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/CMakeCInformation.cmake,v
retrieving revision 1.20.2.1
retrieving revision 1.20.2.2
diff -C 2 -d -r1.20.2.1 -r1.20.2.2
*** CMakeCInformation.cmake 21 Apr 2008 19:21:56 -0000 1.20.2.1
--- CMakeCInformation.cmake 6 Aug 2008 21:04:18 -0000 1.20.2.2
***************
*** 99,103 ****
# CMAKE_C_CREATE_SHARED_LIBRARY
# CMAKE_C_CREATE_SHARED_MODULE
- # CMAKE_C_CREATE_STATIC_LIBRARY
# CMAKE_C_COMPILE_OBJECT
# CMAKE_C_LINK_EXECUTABLE
--- 99,102 ----
***************
*** 134,143 ****
ENDIF(NOT CMAKE_C_CREATE_SHARED_MODULE)
! # create a C static library
! IF(NOT CMAKE_C_CREATE_STATIC_LIBRARY)
! SET(CMAKE_C_CREATE_STATIC_LIBRARY
! "<CMAKE_AR> cr <TARGET> <LINK_FLAGS> <OBJECTS> "
! "<CMAKE_RANLIB> <TARGET> ")
! ENDIF(NOT CMAKE_C_CREATE_STATIC_LIBRARY)
# compile a C file into an object file
--- 133,141 ----
ENDIF(NOT CMAKE_C_CREATE_SHARED_MODULE)
! # Create a static archive incrementally for large object file counts.
! # If CMAKE_C_CREATE_STATIC_LIBRARY is set it will override these.
! SET(CMAKE_C_ARCHIVE_CREATE "<CMAKE_AR> cr <TARGET> <LINK_FLAGS> <OBJECTS>")
! SET(CMAKE_C_ARCHIVE_APPEND "<CMAKE_AR> r <TARGET> <LINK_FLAGS> <OBJECTS>")
! SET(CMAKE_C_ARCHIVE_FINISH "<CMAKE_RANLIB> <TARGET>")
# compile a C file into an object file
Index: CMakeFortranInformation.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/CMakeFortranInformation.cmake,v
retrieving revision 1.18.2.2
retrieving revision 1.18.2.3
diff -C 2 -d -r1.18.2.2 -r1.18.2.3
*** CMakeFortranInformation.cmake 23 Apr 2008 02:05:39 -0000 1.18.2.2
--- CMakeFortranInformation.cmake 6 Aug 2008 21:04:18 -0000 1.18.2.3
***************
*** 120,124 ****
# CMAKE_Fortran_CREATE_SHARED_LIBRARY
# CMAKE_Fortran_CREATE_SHARED_MODULE
- # CMAKE_Fortran_CREATE_STATIC_LIBRARY
# CMAKE_Fortran_COMPILE_OBJECT
# CMAKE_Fortran_LINK_EXECUTABLE
--- 120,123 ----
***************
*** 135,144 ****
ENDIF(NOT CMAKE_Fortran_CREATE_SHARED_MODULE)
! # create a Fortran static library
! IF(NOT CMAKE_Fortran_CREATE_STATIC_LIBRARY)
! SET(CMAKE_Fortran_CREATE_STATIC_LIBRARY
! "<CMAKE_AR> cr <TARGET> <LINK_FLAGS> <OBJECTS> "
! "<CMAKE_RANLIB> <TARGET> ")
! ENDIF(NOT CMAKE_Fortran_CREATE_STATIC_LIBRARY)
# compile a Fortran file into an object file
--- 134,142 ----
ENDIF(NOT CMAKE_Fortran_CREATE_SHARED_MODULE)
! # Create a static archive incrementally for large object file counts.
! # If CMAKE_Fortran_CREATE_STATIC_LIBRARY is set it will override these.
! SET(CMAKE_Fortran_ARCHIVE_CREATE "<CMAKE_AR> cr <TARGET> <LINK_FLAGS> <OBJECTS>")
! SET(CMAKE_Fortran_ARCHIVE_APPEND "<CMAKE_AR> r <TARGET> <LINK_FLAGS> <OBJECTS>")
! SET(CMAKE_Fortran_ARCHIVE_FINISH "<CMAKE_RANLIB> <TARGET>")
# compile a Fortran file into an object file
Index: FindKDE3.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindKDE3.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
*** FindKDE3.cmake 25 Jun 2008 13:51:31 -0000 1.10.2.2
--- FindKDE3.cmake 6 Aug 2008 21:04:18 -0000 1.10.2.3
***************
*** 191,195 ****
IF("${out}" MATCHES "2.9[56]")
SET(_KDE3_USE_FLAGS FALSE)
! ENDIF("${out}" out MATCHES "2.9[56]")
ENDIF(CMAKE_COMPILER_IS_GNUCXX)
--- 191,195 ----
IF("${out}" MATCHES "2.9[56]")
SET(_KDE3_USE_FLAGS FALSE)
! ENDIF("${out}" MATCHES "2.9[56]")
ENDIF(CMAKE_COMPILER_IS_GNUCXX)
Index: FindImageMagick.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindImageMagick.cmake,v
retrieving revision 1.4.14.1
retrieving revision 1.4.14.2
diff -C 2 -d -r1.4.14.1 -r1.4.14.2
*** FindImageMagick.cmake 30 Jul 2008 18:54:49 -0000 1.4.14.1
--- FindImageMagick.cmake 6 Aug 2008 21:04:18 -0000 1.4.14.2
***************
*** 30,34 ****
# Magick++
# MagickWand
! # Magick
#
# For these components the following variables are set:
--- 30,34 ----
# Magick++
# MagickWand
! # MagickCore
#
# For these components the following variables are set:
More information about the Cmake-commits
mailing list