[Cmake-commits] CMake branch, next, updated. v2.8.6-1819-gfb48538
David Cole
david.cole at kitware.com
Tue Nov 8 15:35:51 EST 2011
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".
The branch, next has been updated
via fb48538ed184d1fd0cb0b9c748c823e56f8891f3 (commit)
via 51f442e6034a151e797f678e479073285b433d71 (commit)
via d85ab7a41212c7d42305dd1e33d8f5a0ac9fdf68 (commit)
from 96dd530410d13238a697d1d9df9c9b6804855f74 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=fb48538ed184d1fd0cb0b9c748c823e56f8891f3
commit fb48538ed184d1fd0cb0b9c748c823e56f8891f3
Merge: 96dd530 51f442e
Author: David Cole <david.cole at kitware.com>
AuthorDate: Tue Nov 8 15:35:49 2011 -0500
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Nov 8 15:35:49 2011 -0500
Merge topic 'fix-11213-vs10-mfc-support' into next
51f442e VS11: Update InstallRequiredSystemLibraries.cmake for VS11 (#11213)
d85ab7a Tests: Add environment logging to the MFC test (#11213)
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=51f442e6034a151e797f678e479073285b433d71
commit 51f442e6034a151e797f678e479073285b433d71
Author: David Cole <david.cole at kitware.com>
AuthorDate: Tue Nov 8 15:22:40 2011 -0500
Commit: David Cole <david.cole at kitware.com>
CommitDate: Tue Nov 8 15:22:40 2011 -0500
VS11: Update InstallRequiredSystemLibraries.cmake for VS11 (#11213)
Should fix the newly added MFC test on VS11 dashboards.
diff --git a/Modules/InstallRequiredSystemLibraries.cmake b/Modules/InstallRequiredSystemLibraries.cmake
index b6735c1..65d254a 100644
--- a/Modules/InstallRequiredSystemLibraries.cmake
+++ b/Modules/InstallRequiredSystemLibraries.cmake
@@ -141,36 +141,46 @@ IF(MSVC)
ENDIF(CMAKE_INSTALL_DEBUG_LIBRARIES)
ENDIF(MSVC90)
- IF(MSVC10)
+ MACRO(MSVCRT_FILES_FOR_VERSION version)
+ SET(v "${version}")
+
# Find the runtime library redistribution directory.
GET_FILENAME_COMPONENT(msvc_install_dir
- "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VisualStudio\\10.0;InstallDir]" ABSOLUTE)
- FIND_PATH(MSVC10_REDIST_DIR NAMES ${CMAKE_MSVC_ARCH}/Microsoft.VC100.CRT
+ "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VisualStudio\\${v}.0;InstallDir]" ABSOLUTE)
+ FIND_PATH(MSVC${v}_REDIST_DIR NAMES ${CMAKE_MSVC_ARCH}/Microsoft.VC${v}0.CRT
PATHS
"${msvc_install_dir}/../../VC/redist"
"${base_dir}/VC/redist"
- "$ENV{ProgramFiles}/Microsoft Visual Studio 10.0/VC/redist"
- "$ENV{ProgramFiles(x86)}/Microsoft Visual Studio 10.0/VC/redist"
+ "$ENV{ProgramFiles}/Microsoft Visual Studio ${v}.0/VC/redist"
+ "$ENV{ProgramFiles(x86)}/Microsoft Visual Studio ${v}.0/VC/redist"
)
- MARK_AS_ADVANCED(MSVC10_REDIST_DIR)
- SET(MSVC10_CRT_DIR "${MSVC10_REDIST_DIR}/${CMAKE_MSVC_ARCH}/Microsoft.VC100.CRT")
+ MARK_AS_ADVANCED(MSVC${v}_REDIST_DIR)
+ SET(MSVC${v}_CRT_DIR "${MSVC${v}_REDIST_DIR}/${CMAKE_MSVC_ARCH}/Microsoft.VC${v}0.CRT")
IF(NOT CMAKE_INSTALL_DEBUG_LIBRARIES_ONLY)
SET(__install__libs
- "${MSVC10_CRT_DIR}/msvcp100.dll"
- "${MSVC10_CRT_DIR}/msvcr100.dll"
+ "${MSVC${v}_CRT_DIR}/msvcp${v}0.dll"
+ "${MSVC${v}_CRT_DIR}/msvcr${v}0.dll"
)
ENDIF(NOT CMAKE_INSTALL_DEBUG_LIBRARIES_ONLY)
IF(CMAKE_INSTALL_DEBUG_LIBRARIES)
- SET(MSVC10_CRT_DIR
- "${MSVC10_REDIST_DIR}/Debug_NonRedist/${CMAKE_MSVC_ARCH}/Microsoft.VC100.DebugCRT")
+ SET(MSVC${v}_CRT_DIR
+ "${MSVC${v}_REDIST_DIR}/Debug_NonRedist/${CMAKE_MSVC_ARCH}/Microsoft.VC${v}0.DebugCRT")
SET(__install__libs ${__install__libs}
- "${MSVC10_CRT_DIR}/msvcp100d.dll"
- "${MSVC10_CRT_DIR}/msvcr100d.dll"
+ "${MSVC${v}_CRT_DIR}/msvcp${v}0d.dll"
+ "${MSVC${v}_CRT_DIR}/msvcr${v}0d.dll"
)
ENDIF(CMAKE_INSTALL_DEBUG_LIBRARIES)
- ENDIF(MSVC10)
+ ENDMACRO()
+
+ IF(MSVC10)
+ MSVCRT_FILES_FOR_VERSION(10)
+ ENDIF()
+
+ IF(MSVC11)
+ MSVCRT_FILES_FOR_VERSION(11)
+ ENDIF()
IF(CMAKE_INSTALL_MFC_LIBRARIES)
IF(MSVC70)
@@ -273,42 +283,52 @@ IF(MSVC)
)
ENDIF(MSVC90)
- IF(MSVC10)
+ MACRO(MFC_FILES_FOR_VERSION version)
+ SET(v "${version}")
+
IF(CMAKE_INSTALL_DEBUG_LIBRARIES)
- SET(MSVC10_MFC_DIR
- "${MSVC10_REDIST_DIR}/Debug_NonRedist/${CMAKE_MSVC_ARCH}/Microsoft.VC100.DebugMFC")
+ SET(MSVC${v}_MFC_DIR
+ "${MSVC${v}_REDIST_DIR}/Debug_NonRedist/${CMAKE_MSVC_ARCH}/Microsoft.VC${v}0.DebugMFC")
SET(__install__libs ${__install__libs}
- "${MSVC10_MFC_DIR}/mfc100d.dll"
- "${MSVC10_MFC_DIR}/mfc100ud.dll"
- "${MSVC10_MFC_DIR}/mfcm100d.dll"
- "${MSVC10_MFC_DIR}/mfcm100ud.dll"
+ "${MSVC${v}_MFC_DIR}/mfc${v}0d.dll"
+ "${MSVC${v}_MFC_DIR}/mfc${v}0ud.dll"
+ "${MSVC${v}_MFC_DIR}/mfcm${v}0d.dll"
+ "${MSVC${v}_MFC_DIR}/mfcm${v}0ud.dll"
)
ENDIF(CMAKE_INSTALL_DEBUG_LIBRARIES)
- SET(MSVC10_MFC_DIR "${MSVC10_REDIST_DIR}/${CMAKE_MSVC_ARCH}/Microsoft.VC100.MFC")
+ SET(MSVC${v}_MFC_DIR "${MSVC${v}_REDIST_DIR}/${CMAKE_MSVC_ARCH}/Microsoft.VC${v}0.MFC")
IF(NOT CMAKE_INSTALL_DEBUG_LIBRARIES_ONLY)
SET(__install__libs ${__install__libs}
- "${MSVC10_MFC_DIR}/mfc100.dll"
- "${MSVC10_MFC_DIR}/mfc100u.dll"
- "${MSVC10_MFC_DIR}/mfcm100.dll"
- "${MSVC10_MFC_DIR}/mfcm100u.dll"
+ "${MSVC${v}_MFC_DIR}/mfc${v}0.dll"
+ "${MSVC${v}_MFC_DIR}/mfc${v}0u.dll"
+ "${MSVC${v}_MFC_DIR}/mfcm${v}0.dll"
+ "${MSVC${v}_MFC_DIR}/mfcm${v}0u.dll"
)
ENDIF(NOT CMAKE_INSTALL_DEBUG_LIBRARIES_ONLY)
- # include the language dll's for vs10 as well as the actuall dll's
- SET(MSVC10_MFCLOC_DIR "${MSVC10_REDIST_DIR}/${CMAKE_MSVC_ARCH}/Microsoft.VC100.MFCLOC")
+ # include the language dll's as well as the actuall dll's
+ SET(MSVC${v}_MFCLOC_DIR "${MSVC${v}_REDIST_DIR}/${CMAKE_MSVC_ARCH}/Microsoft.VC${v}0.MFCLOC")
SET(__install__libs ${__install__libs}
- "${MSVC10_MFCLOC_DIR}/mfc100chs.dll"
- "${MSVC10_MFCLOC_DIR}/mfc100cht.dll"
- "${MSVC10_MFCLOC_DIR}/mfc100enu.dll"
- "${MSVC10_MFCLOC_DIR}/mfc100esp.dll"
- "${MSVC10_MFCLOC_DIR}/mfc100deu.dll"
- "${MSVC10_MFCLOC_DIR}/mfc100fra.dll"
- "${MSVC10_MFCLOC_DIR}/mfc100ita.dll"
- "${MSVC10_MFCLOC_DIR}/mfc100jpn.dll"
- "${MSVC10_MFCLOC_DIR}/mfc100kor.dll"
+ "${MSVC${v}_MFCLOC_DIR}/mfc${v}0chs.dll"
+ "${MSVC${v}_MFCLOC_DIR}/mfc${v}0cht.dll"
+ "${MSVC${v}_MFCLOC_DIR}/mfc${v}0enu.dll"
+ "${MSVC${v}_MFCLOC_DIR}/mfc${v}0esp.dll"
+ "${MSVC${v}_MFCLOC_DIR}/mfc${v}0deu.dll"
+ "${MSVC${v}_MFCLOC_DIR}/mfc${v}0fra.dll"
+ "${MSVC${v}_MFCLOC_DIR}/mfc${v}0ita.dll"
+ "${MSVC${v}_MFCLOC_DIR}/mfc${v}0jpn.dll"
+ "${MSVC${v}_MFCLOC_DIR}/mfc${v}0kor.dll"
)
- ENDIF(MSVC10)
+ ENDMACRO()
+
+ IF(MSVC10)
+ MFC_FILES_FOR_VERSION(10)
+ ENDIF()
+
+ IF(MSVC11)
+ MFC_FILES_FOR_VERSION(11)
+ ENDIF()
ENDIF(CMAKE_INSTALL_MFC_LIBRARIES)
FOREACH(lib
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d85ab7a41212c7d42305dd1e33d8f5a0ac9fdf68
commit d85ab7a41212c7d42305dd1e33d8f5a0ac9fdf68
Author: David Cole <david.cole at kitware.com>
AuthorDate: Tue Nov 8 15:11:31 2011 -0500
Commit: David Cole <david.cole at kitware.com>
CommitDate: Tue Nov 8 15:13:52 2011 -0500
Tests: Add environment logging to the MFC test (#11213)
Simply to ease analyzing still-occurring dashboard failures.
diff --git a/Tests/MFC/CMakeLists.txt b/Tests/MFC/CMakeLists.txt
index ea5c41d..df3149a 100644
--- a/Tests/MFC/CMakeLists.txt
+++ b/Tests/MFC/CMakeLists.txt
@@ -48,3 +48,14 @@ add_test(
COMMAND ${CMAKE_COMMAND}
-P "${CMAKE_CURRENT_BINARY_DIR}/ValidateBuild.cmake"
)
+
+
+add_test(
+ NAME environment
+ COMMAND ${CMAKE_COMMAND} -E environment
+ )
+
+
+message(STATUS "===== environment =====")
+execute_process(COMMAND ${CMAKE_COMMAND} -E environment)
+message(STATUS "===== /environment =====")
-----------------------------------------------------------------------
Summary of changes:
Modules/InstallRequiredSystemLibraries.cmake | 96 ++++++++++++++++----------
Tests/MFC/CMakeLists.txt | 11 +++
2 files changed, 69 insertions(+), 38 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list