diff options
| author | Brad King <brad.king@kitware.com> | 2011-01-11 20:52:36 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2011-01-11 20:52:36 (GMT) |
| commit | 9a81f0dd0cd45715456b4d298403833b22832cf0 (patch) | |
| tree | 282d0c90da626631e7ad51780b1fdf943f2e8620 /Tests | |
| parent | c39abc24111ecdfc1e8d6cb29c7687430e9aaca0 (diff) | |
| parent | d67a5134471dadb8b9578d598002832114a171b4 (diff) | |
| download | CMake-9a81f0dd0cd45715456b4d298403833b22832cf0.zip CMake-9a81f0dd0cd45715456b4d298403833b22832cf0.tar.gz CMake-9a81f0dd0cd45715456b4d298403833b22832cf0.tar.bz2 | |
Merge topic 'ep-fix-substitutions'
d67a513 ExternalProject: Replace location tags in CMAKE_CACHE_ARGS
d7a87b5 Merge branch 'ep-log-output-under-vs' into ep-fix-substitutions
Diffstat (limited to 'Tests')
| -rw-r--r-- | Tests/ExternalProject/CMakeLists.txt | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Tests/ExternalProject/CMakeLists.txt b/Tests/ExternalProject/CMakeLists.txt index a878194..5158f31 100644 --- a/Tests/ExternalProject/CMakeLists.txt +++ b/Tests/ExternalProject/CMakeLists.txt @@ -115,7 +115,8 @@ if(can_build_tutorial_step5) set(proj TutorialStep5-Local) ExternalProject_Add(${proj} URL "${CMAKE_CURRENT_SOURCE_DIR}/../Tutorial/Step5" - CMAKE_ARGS -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR> -G ${CMAKE_GENERATOR} <SOURCE_DIR> + CMAKE_CACHE_ARGS -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR> + CMAKE_ARGS -G ${CMAKE_GENERATOR} <SOURCE_DIR> TEST_BEFORE_INSTALL 1 LOG_INSTALL 1 ) |