|
@@ -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}"
|