kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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.
This commit is contained in:
Brad King 2014-11-13 13:19:13 -05:00
parent 2d75d7e56b
commit 592644c42c
1 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Tests/BuildDepends/CMakeLists.txt
View File

@ -28,10 +28,6 @@ function(help_xcode_depends)
endif() endif()
endfunction() 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 # The Intel compiler causes the MSVC linker to crash during
# incremental linking, so avoid the /INCREMENTAL:YES flag. # incremental linking, so avoid the /INCREMENTAL:YES flag.
if(WIN32 AND "${CMAKE_CXX_COMPILER_ID}" MATCHES "Intel") if(WIN32 AND "${CMAKE_CXX_COMPILER_ID}" MATCHES "Intel")
@ -218,7 +214,7 @@ try_compile(RESULT
OUTPUT_VARIABLE OUTPUT) OUTPUT_VARIABLE OUTPUT)
# Xcode is in serious need of help here # Xcode is in serious need of help here
if(HELP_XCODE OR HELP_NINJA) if(HELP_XCODE)
try_compile(RESULT try_compile(RESULT
${BuildDepends_BINARY_DIR}/Project ${BuildDepends_BINARY_DIR}/Project
${BuildDepends_SOURCE_DIR}/Project ${BuildDepends_SOURCE_DIR}/Project