diff options
| author | Brad King <brad.king@kitware.com> | 2014-11-17 16:35:45 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2014-11-17 16:35:45 (GMT) |
| commit | 3609fceee75b4f3751a702ac0a7f21e5cbd67a0a (patch) | |
| tree | bc3314e5c0d233b2c79c398c9725ad9222fe35f5 /Tests | |
| parent | a42c51b5ab54d8d318f00cf9938ce9fb1e2ac274 (diff) | |
| parent | 67bd514adce689f4c7f537cdc446c01f7373f5a5 (diff) | |
| download | CMake-3609fceee75b4f3751a702ac0a7f21e5cbd67a0a.zip CMake-3609fceee75b4f3751a702ac0a7f21e5cbd67a0a.tar.gz CMake-3609fceee75b4f3751a702ac0a7f21e5cbd67a0a.tar.bz2 | |
Merge topic 'ninja-minor-refactoring'
67bd514a Ninja: Refactor restat to be a string internally
ef42e57d Ninja: Use a TARGET_FILE variable to hold the link output file
592644c4 Tests/BuildDepends: Drop unneeded help for Ninja
Diffstat (limited to 'Tests')
| -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 |