diff options
| author | Brad King <brad.king@kitware.com> | 2016-03-24 12:49:41 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2016-03-24 12:49:41 (GMT) |
| commit | 5b2acf6c1c904df96bd0031c9469e61118da5200 (patch) | |
| tree | af7a870a3b4490f521d5d8c87a182d8f63930698 /Tests/RunCMake/CMakeLists.txt | |
| parent | 59f53f7422818f3ccad8518ab0863de6bb7fd293 (diff) | |
| parent | ad140c6e1bb6eda5d17a199304578dbd92bedbad (diff) | |
| download | CMake-5b2acf6c1c904df96bd0031c9469e61118da5200.zip CMake-5b2acf6c1c904df96bd0031c9469e61118da5200.tar.gz CMake-5b2acf6c1c904df96bd0031c9469e61118da5200.tar.bz2 | |
Merge topic 'vs-startup-project'
ad140c6e VS: Put ALL_BUILD in the PREDEFINED_TARGETS_FOLDER
f069be05 VS: Fix default target support for targets nested inside a folder
c05ea485 VS: Improve unit test macros
78ec0461 VS: Add option to choose the `.sln` startup project (#15578)
Diffstat (limited to 'Tests/RunCMake/CMakeLists.txt')
| -rw-r--r-- | Tests/RunCMake/CMakeLists.txt | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/Tests/RunCMake/CMakeLists.txt b/Tests/RunCMake/CMakeLists.txt index 048b5e3..d22c39c 100644 --- a/Tests/RunCMake/CMakeLists.txt +++ b/Tests/RunCMake/CMakeLists.txt @@ -235,7 +235,10 @@ endif() if("${CMAKE_GENERATOR}" MATCHES "Visual Studio") add_RunCMake_test(include_external_msproject) - add_RunCMake_test(VSSolution) + if("${CMAKE_GENERATOR}" MATCHES "Visual Studio ([789]|10)" AND NOT CMAKE_VS_DEVENV_COMMAND) + set(NO_USE_FOLDERS 1) + endif() + add_RunCMake_test(VSSolution -DNO_USE_FOLDERS=${NO_USE_FOLDERS}) endif() if("${CMAKE_GENERATOR}" MATCHES "Visual Studio ([^789]|[789][0-9])") |