[Cmake-commits] [cmake-commits] king committed CMakeCCompiler.cmake.in 1.22.2.1 1.22.2.2 CMakeCXXCompiler.cmake.in 1.22.2.1 1.22.2.2 CMakeDetermineCompilerId.cmake 1.19.4.4 1.19.4.5 CMakeDetermineFortranCompiler.cmake 1.26.2.2 1.26.2.3 CTest.cmake 1.19.2.2 1.19.2.3 DartConfiguration.tcl.in 1.11.2.2 1.11.2.3 FindCUDA.cmake 1.2.2.5 1.2.2.6 NSIS.template.in 1.38.2.3 1.38.2.4
cmake-commits at cmake.org
cmake-commits at cmake.org
Thu Feb 11 10:50:43 EST 2010
Update of /cvsroot/CMake/CMake/Modules
In directory public:/mounts/ram/cvs-serv14303/Modules
Modified Files:
Tag: CMake-2-8
CMakeCCompiler.cmake.in CMakeCXXCompiler.cmake.in
CMakeDetermineCompilerId.cmake
CMakeDetermineFortranCompiler.cmake CTest.cmake
DartConfiguration.tcl.in FindCUDA.cmake NSIS.template.in
Log Message:
CMake 2.8.1-rc2
Index: NSIS.template.in
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/NSIS.template.in,v
retrieving revision 1.38.2.3
retrieving revision 1.38.2.4
diff -C 2 -d -r1.38.2.3 -r1.38.2.4
*** NSIS.template.in 28 Jan 2010 21:47:42 -0000 1.38.2.3
--- NSIS.template.in 11 Feb 2010 15:50:41 -0000 1.38.2.4
***************
*** 214,217 ****
--- 214,226 ----
ReadEnvStr $1 PATH
+ ; if the path is too long for a NSIS variable NSIS will return a 0
+ ; length string. If we find that, then warn and skip any path
+ ; modification as it will trash the existing path.
+ StrLen $2 $1
+ IntCmp $2 0 CheckPathLength_ShowPathWarning CheckPathLength_Done CheckPathLength_Done
+ CheckPathLength_ShowPathWarning:
+ Messagebox MB_OK|MB_ICONEXCLAMATION "Warning! PATH too long installer unable to modify PATH!"
+ Goto AddToPath_done
+ CheckPathLength_Done:
Push "$1;"
Push "$0;"
Index: CMakeDetermineCompilerId.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/CMakeDetermineCompilerId.cmake,v
retrieving revision 1.19.4.4
retrieving revision 1.19.4.5
diff -C 2 -d -r1.19.4.4 -r1.19.4.5
*** CMakeDetermineCompilerId.cmake 1 Feb 2010 14:22:35 -0000 1.19.4.4
--- CMakeDetermineCompilerId.cmake 11 Feb 2010 15:50:41 -0000 1.19.4.5
***************
*** 43,46 ****
--- 43,51 ----
ENDFOREACH(flags)
+ # If the compiler is still unknown, try to query its vendor.
+ IF(NOT CMAKE_${lang}_COMPILER_ID)
+ CMAKE_DETERMINE_COMPILER_ID_VENDOR(${lang})
+ ENDIF()
+
# if the format is unknown after all files have been checked, put "Unknown" in the cache
IF(NOT CMAKE_EXECUTABLE_FORMAT)
***************
*** 246,247 ****
--- 251,287 ----
SET(CMAKE_EXECUTABLE_FORMAT "${CMAKE_EXECUTABLE_FORMAT}" PARENT_SCOPE)
ENDFUNCTION(CMAKE_DETERMINE_COMPILER_ID_CHECK lang)
+
+ #-----------------------------------------------------------------------------
+ # Function to query the compiler vendor.
+ # This uses a table with entries of the form
+ # list(APPEND CMAKE_${lang}_COMPILER_ID_VENDORS ${vendor})
+ # set(CMAKE_${lang}_COMPILER_ID_VENDOR_FLAGS_${vendor} -some-vendor-flag)
+ # set(CMAKE_${lang}_COMPILER_ID_VENDOR_REGEX_${vendor} "Some Vendor Output")
+ # We try running the compiler with the flag for each vendor and
+ # matching its regular expression in the output.
+ FUNCTION(CMAKE_DETERMINE_COMPILER_ID_VENDOR lang)
+ FOREACH(vendor ${CMAKE_${lang}_COMPILER_ID_VENDORS})
+ SET(flags ${CMAKE_${lang}_COMPILER_ID_VENDOR_FLAGS_${vendor}})
+ SET(regex ${CMAKE_${lang}_COMPILER_ID_VENDOR_REGEX_${vendor}})
+ EXECUTE_PROCESS(
+ COMMAND ${CMAKE_${lang}_COMPILER}
+ ${CMAKE_${lang}_COMPILER_ID_ARG1}
+ ${CMAKE_${lang}_COMPILER_ID_FLAGS_LIST}
+ ${flags}
+ WORKING_DIRECTORY ${CMAKE_${lang}_COMPILER_ID_DIR}
+ OUTPUT_VARIABLE output ERROR_VARIABLE output
+ RESULT_VARIABLE result
+ )
+ IF("${output}" MATCHES "${regex}")
+ FILE(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeOutput.log
+ "Checking whether the ${lang} compiler is ${vendor} using \"${flags}\" "
+ "matched \"${regex}\":\n${output}")
+ SET(CMAKE_${lang}_COMPILER_ID "${vendor}" PARENT_SCOPE)
+ BREAK()
+ ELSE()
+ FILE(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeError.log
+ "Checking whether the ${lang} compiler is ${vendor} using \"${flags}\" "
+ "did not match \"${regex}\":\n${output}")
+ ENDIF()
+ ENDFOREACH()
+ ENDFUNCTION(CMAKE_DETERMINE_COMPILER_ID_VENDOR)
Index: CMakeCXXCompiler.cmake.in
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/CMakeCXXCompiler.cmake.in,v
retrieving revision 1.22.2.1
retrieving revision 1.22.2.2
diff -C 2 -d -r1.22.2.1 -r1.22.2.2
*** CMakeCXXCompiler.cmake.in 28 Jan 2010 21:47:34 -0000 1.22.2.1
--- CMakeCXXCompiler.cmake.in 11 Feb 2010 15:50:41 -0000 1.22.2.2
***************
*** 40,43 ****
--- 40,44 ----
SET(CMAKE_CXX_HAS_ISYSROOT "@CMAKE_CXX_HAS_ISYSROOT@")
+ @CMAKE_CXX_OSX_DEPLOYMENT_TARGET_FLAG_CODE@
SET(CMAKE_CXX_IMPLICIT_LINK_LIBRARIES "@CMAKE_CXX_IMPLICIT_LINK_LIBRARIES@")
Index: CMakeDetermineFortranCompiler.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/CMakeDetermineFortranCompiler.cmake,v
retrieving revision 1.26.2.2
retrieving revision 1.26.2.3
diff -C 2 -d -r1.26.2.2 -r1.26.2.3
*** CMakeDetermineFortranCompiler.cmake 28 Jan 2010 21:47:34 -0000 1.26.2.2
--- CMakeDetermineFortranCompiler.cmake 11 Feb 2010 15:50:41 -0000 1.26.2.3
***************
*** 163,166 ****
--- 163,171 ----
)
+ # Table of per-vendor compiler id flags with expected output.
+ LIST(APPEND CMAKE_Fortran_COMPILER_ID_VENDORS Compaq)
+ SET(CMAKE_Fortran_COMPILER_ID_VENDOR_FLAGS_Compaq "-what")
+ SET(CMAKE_Fortran_COMPILER_ID_VENDOR_REGEX_Compaq "Compaq Visual Fortran")
+
# Try to identify the compiler.
SET(CMAKE_Fortran_COMPILER_ID)
Index: CMakeCCompiler.cmake.in
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/CMakeCCompiler.cmake.in,v
retrieving revision 1.22.2.1
retrieving revision 1.22.2.2
diff -C 2 -d -r1.22.2.1 -r1.22.2.2
*** CMakeCCompiler.cmake.in 28 Jan 2010 21:47:33 -0000 1.22.2.1
--- CMakeCCompiler.cmake.in 11 Feb 2010 15:50:41 -0000 1.22.2.2
***************
*** 39,42 ****
--- 39,43 ----
SET(CMAKE_C_HAS_ISYSROOT "@CMAKE_C_HAS_ISYSROOT@")
+ @CMAKE_C_OSX_DEPLOYMENT_TARGET_FLAG_CODE@
SET(CMAKE_C_IMPLICIT_LINK_LIBRARIES "@CMAKE_C_IMPLICIT_LINK_LIBRARIES@")
Index: FindCUDA.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindCUDA.cmake,v
retrieving revision 1.2.2.5
retrieving revision 1.2.2.6
diff -C 2 -d -r1.2.2.5 -r1.2.2.6
*** FindCUDA.cmake 28 Jan 2010 21:47:36 -0000 1.2.2.5
--- FindCUDA.cmake 11 Feb 2010 15:50:41 -0000 1.2.2.6
***************
*** 107,113 ****
# build rules specified by CMAKE and the cuda files are compiled to object
# files using nvcc and the host compiler. In addition CUDA_INCLUDE_DIRS is
! # added automatically to include_directories(). Standard CMake target calls
! # can be used on the target after calling this macro
! # (e.g. set_target_properties and target_link_libraries).
#
# CUDA_ADD_LIBRARY( cuda_target file0 file1 ...
--- 107,116 ----
# build rules specified by CMAKE and the cuda files are compiled to object
# files using nvcc and the host compiler. In addition CUDA_INCLUDE_DIRS is
! # added automatically to include_directories(). Some standard CMake target
! # calls can be used on the target after calling this macro
! # (e.g. set_target_properties and target_link_libraries), but setting
! # properties that adjust compilation flags will not affect code compiled by
! # nvcc. Such flags should be modified before calling CUDA_ADD_EXECUTABLE,
! # CUDA_ADD_LIBRARY or CUDA_WRAP_SRCS.
#
# CUDA_ADD_LIBRARY( cuda_target file0 file1 ...
***************
*** 544,547 ****
--- 547,558 ----
find_library_local_first(CUDA_CUDART_LIBRARY cudart "\"cudart\" library")
set(CUDA_LIBRARIES ${CUDA_CUDART_LIBRARY})
+ if(APPLE)
+ # We need to add the path to cudart to the linker using rpath, since the
+ # library name for the cuda libraries is prepended with @rpath.
+ get_filename_component(_cuda_path_to_cudart "${CUDA_CUDART_LIBRARY}" PATH)
+ if(_cuda_path_to_cudart)
+ list(APPEND CUDA_LIBRARIES -Wl,-rpath "-Wl,${_cuda_path_to_cudart}")
+ endif()
+ endif()
# 1.1 toolkit on linux doesn't appear to have a separate library on
Index: CTest.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/CTest.cmake,v
retrieving revision 1.19.2.2
retrieving revision 1.19.2.3
diff -C 2 -d -r1.19.2.2 -r1.19.2.3
*** CTest.cmake 28 Jan 2010 21:47:34 -0000 1.19.2.2
--- CTest.cmake 11 Feb 2010 15:50:41 -0000 1.19.2.3
***************
*** 127,154 ****
FIND_PROGRAM(BZRCOMMAND bzr)
FIND_PROGRAM(HGCOMMAND hg)
IF(NOT UPDATE_TYPE)
IF(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/CVS")
SET(UPDATE_TYPE cvs)
! ELSE(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/CVS")
! IF(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/.svn")
! SET(UPDATE_TYPE svn)
! ELSE(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/.svn")
! IF(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/.bzr")
! SET(UPDATE_TYPE bzr)
! ELSE(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/.bzr")
! IF(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/.hg")
! SET(UPDATE_TYPE hg)
! ENDIF(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/.hg")
! ENDIF(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/.bzr")
! ENDIF(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/.svn")
! ENDIF(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/CVS")
! ENDIF(NOT UPDATE_TYPE)
!
! 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)
--- 127,144 ----
FIND_PROGRAM(BZRCOMMAND bzr)
FIND_PROGRAM(HGCOMMAND hg)
+ FIND_PROGRAM(GITCOMMAND git)
IF(NOT UPDATE_TYPE)
IF(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/CVS")
SET(UPDATE_TYPE cvs)
! ELSEIF(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/.svn")
! SET(UPDATE_TYPE svn)
! ELSEIF(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/.bzr")
! SET(UPDATE_TYPE bzr)
! ELSEIF(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/.hg")
! SET(UPDATE_TYPE hg)
! ELSEIF(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/.git")
! SET(UPDATE_TYPE git)
! ENDIF()
ENDIF(NOT UPDATE_TYPE)
***************
*** 157,176 ****
SET(UPDATE_COMMAND "${CVSCOMMAND}")
SET(UPDATE_OPTIONS "${CVS_UPDATE_OPTIONS}")
! ELSE("${_update_type}" STREQUAL "cvs")
! IF("${_update_type}" STREQUAL "svn")
! SET(UPDATE_COMMAND "${SVNCOMMAND}")
! SET(UPDATE_OPTIONS "${SVN_UPDATE_OPTIONS}")
! ELSE("${_update_type}" STREQUAL "svn")
! IF("${_update_type}" STREQUAL "bzr")
! SET(UPDATE_COMMAND "${BZRCOMMAND}")
! SET(UPDATE_OPTIONS "${BZR_UPDATE_OPTIONS}")
! ELSE("${_update_type}" STREQUAL "bzr")
! IF("${_update_type}" STREQUAL "hg")
! SET(UPDATE_COMMAND "${HGCOMMAND}")
! SET(UPDATE_OPTIONS "${HG_UPDATE_OPTIONS}")
! ENDIF("${_update_type}" STREQUAL "hg")
! ENDIF("${_update_type}" STREQUAL "bzr")
! ENDIF("${_update_type}" STREQUAL "svn")
! ENDIF("${_update_type}" STREQUAL "cvs")
SET(DART_TESTING_TIMEOUT 1500 CACHE STRING
--- 147,163 ----
SET(UPDATE_COMMAND "${CVSCOMMAND}")
SET(UPDATE_OPTIONS "${CVS_UPDATE_OPTIONS}")
! ELSEIF("${_update_type}" STREQUAL "svn")
! SET(UPDATE_COMMAND "${SVNCOMMAND}")
! SET(UPDATE_OPTIONS "${SVN_UPDATE_OPTIONS}")
! ELSEIF("${_update_type}" STREQUAL "bzr")
! SET(UPDATE_COMMAND "${BZRCOMMAND}")
! SET(UPDATE_OPTIONS "${BZR_UPDATE_OPTIONS}")
! ELSEIF("${_update_type}" STREQUAL "hg")
! SET(UPDATE_COMMAND "${HGCOMMAND}")
! SET(UPDATE_OPTIONS "${HG_UPDATE_OPTIONS}")
! ELSEIF("${_update_type}" STREQUAL "git")
! SET(UPDATE_COMMAND "${GITCOMMAND}")
! SET(UPDATE_OPTIONS "${GIT_UPDATE_OPTIONS}")
! ENDIF()
SET(DART_TESTING_TIMEOUT 1500 CACHE STRING
***************
*** 265,268 ****
--- 252,256 ----
BZRCOMMAND
HGCOMMAND
+ GITCOMMAND
CVS_UPDATE_OPTIONS
SVN_UPDATE_OPTIONS
Index: DartConfiguration.tcl.in
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/DartConfiguration.tcl.in,v
retrieving revision 1.11.2.2
retrieving revision 1.11.2.3
diff -C 2 -d -r1.11.2.2 -r1.11.2.3
*** DartConfiguration.tcl.in 28 Jan 2010 21:47:34 -0000 1.11.2.2
--- DartConfiguration.tcl.in 11 Feb 2010 15:50:41 -0000 1.11.2.3
***************
*** 17,20 ****
--- 17,21 ----
IsCDash: @CTEST_DROP_SITE_CDASH@
CDashVersion: @CTEST_CDASH_VERSION@
+ QueryCDashVersion: @CTEST_CDASH_QUERY_VERSION@
DropSite: @DROP_SITE@
DropLocation: @DROP_LOCATION@
More information about the Cmake-commits
mailing list