diff options
-rw-r--r-- | Source/cmGetTestPropertyCommand.cxx | 4 | ||||
-rw-r--r-- | Source/kwsys/CMakeLists.txt | 4 |
2 files changed, 3 insertions, 5 deletions
diff --git a/Source/cmGetTestPropertyCommand.cxx b/Source/cmGetTestPropertyCommand.cxx index 3e75f88..d48cd6c 100644 --- a/Source/cmGetTestPropertyCommand.cxx +++ b/Source/cmGetTestPropertyCommand.cxx @@ -30,11 +30,11 @@ bool cmGetTestPropertyCommand::InitialPass( } std::string testName = args[0]; - std::string var = args[1]; + std::string var = args[2]; cmTest *test = m_Makefile->GetTest(testName.c_str()); if (test) { - const char *prop = test->GetProperty(args[2].c_str()); + const char *prop = test->GetProperty(args[1].c_str()); if (prop) { m_Makefile->AddDefinition(var.c_str(), prop); diff --git a/Source/kwsys/CMakeLists.txt b/Source/kwsys/CMakeLists.txt index 3fe16c0..c0998fe 100644 --- a/Source/kwsys/CMakeLists.txt +++ b/Source/kwsys/CMakeLists.txt @@ -630,9 +630,7 @@ IF(KWSYS_STANDALONE OR CMake_SOURCE_DIR) ADD_TEST(kwsys.testFail ${EXEC_DIR}/testFail) SET_TESTS_PROPERTIES(kwsys.testFail PROPERTIES WILL_FAIL ON) GET_TEST_PROPERTY(kwsys.testFail WILL_FAIL wfv) - IF(NOT $wfv}) - MESSAGE(FATAL_ERROR "GET_TEST_PROPERTY command does not work") - ENDIF(NOT $wfv}) + MESSAGE("GET_TEST_PROPERTY returned: ${wfv}") ENDIF(COMMAND SET_TESTS_PROPERTIES) ENDIF(BUILD_TESTING) ENDIF(KWSYS_STANDALONE OR CMake_SOURCE_DIR) |