summaryrefslogtreecommitdiffstats
path: root/Tests/ExternalProject
diff options
context:
space:
mode:
authorDavid Cole <david.cole@kitware.com>2011-11-09 18:31:05 (GMT)
committerDavid Cole <david.cole@kitware.com>2011-11-09 18:35:28 (GMT)
commit537020f9581d36c436d18e30f98d58f0ef5924cc (patch)
tree93fa26c78f7d4c92e37312dc500544f8577abbbd /Tests/ExternalProject
parent51f442e6034a151e797f678e479073285b433d71 (diff)
downloadCMake-537020f9581d36c436d18e30f98d58f0ef5924cc.zip
CMake-537020f9581d36c436d18e30f98d58f0ef5924cc.tar.gz
CMake-537020f9581d36c436d18e30f98d58f0ef5924cc.tar.bz2
Tests: Nudge MFC test to pass on VS 6 dashboards (#11213)
InstallRequiredSystemLibraries does not install any dlls when used with VS 6 dashboards. Modify the ValidateBuild script to expect only 1 file when building with VS 6. Using "-DCMAKE_INSTALL_PREFIX=<INSTALL_DIR>" does not work when <INSTALL_DIR> evaluates to a long enough string. However, using "-DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR>" does work, even with the longer strings. So: make sure to include the ":PATH" when using this construct with ExternalProject calls so that they may install to the proper location on VS 6 builds. All existing calls that match "CMAKE_INSTALL_PREFIX.*INSTALL_DIR" include the ":PATH" after this commit. By the way: https://twitter.com/DLRdave/status/134339505397309440
Diffstat (limited to 'Tests/ExternalProject')
-rw-r--r--Tests/ExternalProject/Example/CMakeLists.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/Tests/ExternalProject/Example/CMakeLists.txt b/Tests/ExternalProject/Example/CMakeLists.txt
index 2cadd7d..69ebaaf 100644
--- a/Tests/ExternalProject/Example/CMakeLists.txt
+++ b/Tests/ExternalProject/Example/CMakeLists.txt
@@ -6,6 +6,6 @@ include(ExternalProject)
ExternalProject_Add(
cmake281
URL http://www.cmake.org/files/v2.8/cmake-2.8.1.tar.gz
- CMAKE_ARGS -D CMAKE_INSTALL_PREFIX=<INSTALL_DIR>
+ CMAKE_ARGS -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR>
BUILD_COMMAND ""
)