[Cmake-commits] [cmake-commits] hoffman committed CMakeLists.txt 1.158.2.4 1.158.2.5 CTestCustom.cmake.in 1.8.2.2 1.8.2.3 ChangeLog.manual 1.1.12.4 1.1.12.5 CompileFlags.cmake 1.3.2.1 1.3.2.2
cmake-commits at cmake.org
cmake-commits at cmake.org
Wed Oct 28 12:14:56 EDT 2009
Update of /cvsroot/CMake/CMake
In directory public:/mounts/ram/cvs-serv18987
Modified Files:
Tag: CMake-2-8
CMakeLists.txt CTestCustom.cmake.in ChangeLog.manual
CompileFlags.cmake
Log Message:
RC 4 merge
Index: CMakeLists.txt
===================================================================
RCS file: /cvsroot/CMake/CMake/CMakeLists.txt,v
retrieving revision 1.158.2.4
retrieving revision 1.158.2.5
diff -C 2 -d -r1.158.2.4 -r1.158.2.5
*** CMakeLists.txt 9 Oct 2009 20:11:10 -0000 1.158.2.4
--- CMakeLists.txt 28 Oct 2009 16:14:53 -0000 1.158.2.5
***************
*** 142,145 ****
--- 142,146 ----
SET(CMAKE_CTEST_COMMAND "${EXECUTABLE_OUTPUT_PATH}/ctest")
SET(CMAKE_CMAKE_COMMAND "${EXECUTABLE_OUTPUT_PATH}/cmake")
+ SET(CMAKE_CPACK_COMMAND "${EXECUTABLE_OUTPUT_PATH}/cpack")
ENDIF(BUILD_TESTING)
***************
*** 147,151 ****
CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/Templates/CTestScript.cmake.in"
"${CMAKE_CURRENT_BINARY_DIR}/CTestScript.cmake"
! @ONLY)
CONFIGURE_FILE(${CMake_SOURCE_DIR}/Tests/.NoDartCoverage
${CMake_BINARY_DIR}/Tests/.NoDartCoverage)
--- 148,152 ----
CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/Templates/CTestScript.cmake.in"
"${CMAKE_CURRENT_BINARY_DIR}/CTestScript.cmake"
! @ONLY)
CONFIGURE_FILE(${CMake_SOURCE_DIR}/Tests/.NoDartCoverage
${CMake_BINARY_DIR}/Tests/.NoDartCoverage)
***************
*** 316,320 ****
SET(CMake_VERSION_MINOR 8)
SET(CMake_VERSION_PATCH 0)
! SET(CMake_VERSION_RC 3)
# We use odd minor numbers for development versions.
--- 317,321 ----
SET(CMake_VERSION_MINOR 8)
SET(CMake_VERSION_PATCH 0)
! SET(CMake_VERSION_RC 4)
# We use odd minor numbers for development versions.
Index: CTestCustom.cmake.in
===================================================================
RCS file: /cvsroot/CMake/CMake/CTestCustom.cmake.in,v
retrieving revision 1.8.2.2
retrieving revision 1.8.2.3
diff -C 2 -d -r1.8.2.2 -r1.8.2.3
*** CTestCustom.cmake.in 9 Oct 2009 20:11:10 -0000 1.8.2.2
--- CTestCustom.cmake.in 28 Oct 2009 16:14:54 -0000 1.8.2.3
***************
*** 54,56 ****
--- 54,59 ----
# Exclude try_compile sources from coverage results:
"/CMakeFiles/CMakeTmp/"
+
+ # Exclude Qt source files from coverage results:
+ "[A-Za-z]./[Qq]t/qt-.+-opensource-src"
)
Index: CompileFlags.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/CompileFlags.cmake,v
retrieving revision 1.3.2.1
retrieving revision 1.3.2.2
diff -C 2 -d -r1.3.2.1 -r1.3.2.2
*** CompileFlags.cmake 1 Oct 2009 21:20:15 -0000 1.3.2.1
--- CompileFlags.cmake 28 Oct 2009 16:14:54 -0000 1.3.2.2
***************
*** 22,32 ****
INCLUDE (${CMAKE_ROOT}/Modules/CMakeBackwardCompatibilityCXX.cmake)
# Disable deprecation warnings for standard C functions.
# really only needed for newer versions of VS, but should
# not hurt other versions, and this will work into the
# future
! IF(MSVC)
ADD_DEFINITIONS(-D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE)
! ENDIF(MSVC)
#silence duplicate symbol warnings on AIX
--- 22,37 ----
INCLUDE (${CMAKE_ROOT}/Modules/CMakeBackwardCompatibilityCXX.cmake)
+ IF(WIN32 AND "${CMAKE_C_COMPILER_ID}" MATCHES "^(Intel)$")
+ SET(_INTEL_WINDOWS 1)
+ ENDIF()
+
# Disable deprecation warnings for standard C functions.
# really only needed for newer versions of VS, but should
# not hurt other versions, and this will work into the
# future
! IF(MSVC OR _INTEL_WINDOWS)
ADD_DEFINITIONS(-D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE)
! ELSE()
! ENDIF()
#silence duplicate symbol warnings on AIX
Index: ChangeLog.manual
===================================================================
RCS file: /cvsroot/CMake/CMake/Attic/ChangeLog.manual,v
retrieving revision 1.1.12.4
retrieving revision 1.1.12.5
diff -C 2 -d -r1.1.12.4 -r1.1.12.5
*** ChangeLog.manual 9 Oct 2009 20:11:10 -0000 1.1.12.4
--- ChangeLog.manual 28 Oct 2009 16:14:54 -0000 1.1.12.5
***************
*** 1,2 ****
--- 1,49 ----
+ Changes in CMake 2.8.0 RC 4
+ - Fix try_compile when file cannot be found
+ - Add new module to test manifest installation issues on windows.
+ - Add more test coverage
+ -Improvements in finding MPI on windows. ENH: reorganized searching mpi for mpi components (include,lib,bin) using a single set of search paths instead of seperately mainted lists of paths for each.
+ - Look for nvcc in the 32 bit bin directory before the 64 bin directory.
+ - BUG: hardcore some values so output matches cmVS10CLFlagTable.h (addresses bug #9753)
+ - Avoid Intel linker crash in BuildDepends test
+ - Fix Intel Fortran SHARED libraries on Linux
+ - Fix working dir issue for ctest
+ - Fix if() command and CMP0012 OLD/NEW behavior
+ - Allow for /D to change install directory on the command line for NSIS
+ - Move SetErrorMode around calls to generate and configure instead of setting it for the whole application for cmake-gui on windows. Allows for bad installs of windows shell programs to not break file completion.
+ - Fix Intel and MinGW Fortran DLL import libraries
+ - Fix Xcode dylib version default
+ - Fix the showing of non-cpp files in the IDE for VS 10
+ - Fix optionally-valued booleans in VS 10 flag table
+ - Detect and set Unicode character set in VS 10
+ - Add support for the g95 Fortran compiler
+ - Test all target types in Fortran
+ - Add Xcode file association for Fortran
+ - Fix VS 10 flag table for precompiled headers
+ - Fix VS 10 .sln files for Windows Explorer
+ - Fix Microsoft.Cpp.$(Platform).user.props in VS10b2
+ - Fix up file(DOWNLOAD ) a bit, better error checking and uses of long not double for timeout as curl needs, bug# 9748
+ - Add a VS 10 Win64 generator
+ - Fix for bug#9686 convert java_home to a cmake path before using.
+ - fix for bug# 9751, add check for MSVC10
+ - Fix for bugs #9756, #9690 and #9755, header files were not included, and link_directories we incorrect
+ - Add a module to test an install tree to verify that the MS CRT version is correct.
+ - Fix seg fault for empty ENV{} call bug #9747
+ - Better fix for finding the MSBuild that matches the VS 10 install.
+ - make testing the CodeBlocks and Eclipse generators easier by not requiring the CMAKE_EDIT_COMMAND variable
+ - Do not link library dependencies in VS solutions
+ - Ctest was broken for subdirs. Restored working directory state for tests so that their executables could be found.
+ - Fixes version detection using osg/Version on Mac OSX when OSG is installed as a framework
+ - Avoid C++ linker language in VS Fortran project
+ - Avoid duplicate ZERO_CHECK in VS solutions
+ - Fixed bug 8319, search for the Python shared library in the standard locations.
+ - Fix bug#9714, should not crash when version file is not where it should be...
+ - Fix ctest output alignment for cases where total tests run is not the same width as max test index.
+ - make it more robust wrt. #9621
+ - Add another possible error message that curl might emit with an empty drop location.
+ - Fix issue #5668 - use CollapseFullPath when determining if covered file is within source or binary tree. Allows gcc/gcov coverage analysis using MinGW on Windows.
+ - CTest-side support for compiler name and compiler version information. Requires CDash update to show on CDash.
+ - Add a bunch more testing coverage.
+
Changes in CMake 2.8.0 RC 3
- CTest Added OS Platform (cpu architecture) detection support to windows system
More information about the Cmake-commits
mailing list