diff options
| author | Brad King <brad.king@kitware.com> | 2014-11-13 18:19:13 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2014-11-14 21:16:00 (GMT) |
| commit | 592644c42c58312aadf1fd1b28e95c7f0fbbb2f8 (patch) | |
| tree | 233ddb727e28edea7a9f7228e3f3530ceb702392 /Tests/BuildDepends | |
| parent | 2d75d7e56bc00c9abe51d39c4306084b24fe8cd5 (diff) | |
| download | CMake-592644c42c58312aadf1fd1b28e95c7f0fbbb2f8.zip CMake-592644c42c58312aadf1fd1b28e95c7f0fbbb2f8.tar.gz CMake-592644c42c58312aadf1fd1b28e95c7f0fbbb2f8.tar.bz2 | |
Tests/BuildDepends: Drop unneeded help for Ninja
The extra post-modification invocations of 'ninja' does not seem to be
needed anymore for the BuildDepends test to pass.
Diffstat (limited to 'Tests/BuildDepends')
| -rw-r--r-- | Tests/BuildDepends/CMakeLists.txt | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/Tests/BuildDepends/CMakeLists.txt b/Tests/BuildDepends/CMakeLists.txt index 8df331e..6209bb8 100644 --- a/Tests/BuildDepends/CMakeLists.txt +++ b/Tests/BuildDepends/CMakeLists.txt @@ -28,10 +28,6 @@ function(help_xcode_depends) endif() endfunction() -if("${CMAKE_GENERATOR}" MATCHES "Ninja") - set(HELP_NINJA 1) # TODO Why is this needed? -endif() - # The Intel compiler causes the MSVC linker to crash during # incremental linking, so avoid the /INCREMENTAL:YES flag. if(WIN32 AND "${CMAKE_CXX_COMPILER_ID}" MATCHES "Intel") @@ -218,7 +214,7 @@ try_compile(RESULT OUTPUT_VARIABLE OUTPUT) # Xcode is in serious need of help here -if(HELP_XCODE OR HELP_NINJA) +if(HELP_XCODE) try_compile(RESULT ${BuildDepends_BINARY_DIR}/Project ${BuildDepends_SOURCE_DIR}/Project |