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

Tests: Drop broken and now unused RunCMake_TEST_FILE option 

We cannot use -DRunCMake_TEST=${RunCMake_TEST_FILE} because test cases
use project(${RunCMake_TEST}) and the project name cannot be a path to a
file.  The parent and grandparent commits removed the only uses of the
option.  Drop it now.
This commit is contained in:
Brad King 2014-06-30 14:35:52 -04:00
parent f0f15b93bd
commit 6eee5d7449
1 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Tests/RunCMake/RunCMake.cmake
View File

@ -38,9 +38,6 @@ function(run_cmake test)
if(NOT DEFINED RunCMake_TEST_OPTIONS) if(NOT DEFINED RunCMake_TEST_OPTIONS)
set(RunCMake_TEST_OPTIONS "") set(RunCMake_TEST_OPTIONS "")
endif() endif()
if (NOT RunCMake_TEST_FILE)
set(RunCMake_TEST_FILE "${test}")
endif()
if(APPLE) if(APPLE)
list(APPEND RunCMake_TEST_OPTIONS -DCMAKE_POLICY_DEFAULT_CMP0025=NEW) list(APPEND RunCMake_TEST_OPTIONS -DCMAKE_POLICY_DEFAULT_CMP0025=NEW)
endif() endif()
@ -57,7 +54,7 @@ function(run_cmake test)
COMMAND ${CMAKE_COMMAND} "${RunCMake_TEST_SOURCE_DIR}" COMMAND ${CMAKE_COMMAND} "${RunCMake_TEST_SOURCE_DIR}"
-G "${RunCMake_GENERATOR}" -G "${RunCMake_GENERATOR}"
-T "${RunCMake_GENERATOR_TOOLSET}" -T "${RunCMake_GENERATOR_TOOLSET}"
-DRunCMake_TEST=${RunCMake_TEST_FILE} -DRunCMake_TEST=${test}
--no-warn-unused-cli --no-warn-unused-cli
${RunCMake_TEST_OPTIONS} ${RunCMake_TEST_OPTIONS}
WORKING_DIRECTORY "${RunCMake_TEST_BINARY_DIR}" WORKING_DIRECTORY "${RunCMake_TEST_BINARY_DIR}"