Qt.git - Qt s a cross-platform application framework that is used for developing application software that can be run on various software and hardware platforms with little or no change in the underlying codebase, while still being a native application with native capabilities and speed.

path: root/doc/src/snippets/code/doc_src_debug.cpp

diff options

author	Qt Continuous Integration System <qt-info@nokia.com>	2011-01-31 22:44:13 (GMT)
committer	Qt Continuous Integration System <qt-info@nokia.com>	2011-01-31 22:44:13 (GMT)
commit	1d43761e846a53897f69efc251ff6f608639a274 (patch)
tree	dfac716f58c587776941f006e9e74abaab533727 /doc/src/snippets/code/doc_src_debug.cpp
parent	9b9c664470af22ab79ed6211cc5c02d715493657 (diff)
parent	1eea6ca3c22a1c859d06b573570314f7bd2f2833 (diff)
download	Qt-1d43761e846a53897f69efc251ff6f608639a274.zip Qt-1d43761e846a53897f69efc251ff6f608639a274.tar.gz Qt-1d43761e846a53897f69efc251ff6f608639a274.tar.bz2

Merge branch '4.7' of git://scm.dev.nokia.troll.no/qt/qt-doc-team

* '4.7' of git://scm.dev.nokia.troll.no/qt/qt-doc-team: Doc: Fixing typo

Diffstat (limited to 'doc/src/snippets/code/doc_src_debug.cpp')

0 files changed, 0 insertions, 0 deletions

test_directory_makefile; + bool test_scopes_handled = + SetPropertyCommand::HandleAndValidateTestDirectoryScopes( + status, test_directory_option_enabled, test_directory, + test_directory_makefile); + if (!(source_file_scopes_handled && test_scopes_handled)) { return false; } bool source_file_paths_should_be_absolute = @@ -441,7 +512,8 @@ bool cmSetPropertyCommand(std::vector const& args, source_file_paths_should_be_absolute); case cmProperty::TEST: return HandleTestMode(status, names, propertyName, propertyValue, - appendAsString, appendMode, remove); + appendAsString, appendMode, remove, + test_directory_makefile); case cmProperty::CACHE: return HandleCacheMode(status, names, propertyName, propertyValue, appendAsString, appendMode, remove); @@ -642,14 +714,14 @@ bool HandleSource(cmSourceFile* sf, const std::string& propertyName, bool HandleTestMode(cmExecutionStatus& status, std::set& names, const std::string& propertyName, const std::string& propertyValue, bool appendAsString, - bool appendMode, bool remove) + bool appendMode, bool remove, cmMakefile* test_makefile) { // Look for tests with all names given. std::set::iterator next; for (auto ni = names.begin(); ni != names.end(); ni = next) { next = ni; ++next; - if (cmTest* test = status.GetMakefile().GetTest(*ni)) { + if (cmTest* test = test_makefile->GetTest(*ni)) { if (HandleTest(test, propertyName, propertyValue, appendAsString, appendMode, remove)) { names.erase(ni); diff --git a/Source/cmSetPropertyCommand.h b/Source/cmSetPropertyCommand.h index 05c4873..4d9480d 100644 --- a/Source/cmSetPropertyCommand.h +++ b/Source/cmSetPropertyCommand.h @@ -33,6 +33,18 @@ bool HandleAndValidateSourceFileDirectoryScopes( std::vector& source_target_directories, std::vector& source_file_directory_makefiles); +bool HandleTestDirectoryScopes(cmExecutionStatus& status, + std::string& test_directory, + cmMakefile*& directory_makefile); + +bool HandleTestDirectoryScopeValidation(cmExecutionStatus& status, + bool test_directory_option_enabled, + std::string& test_directory); + +bool HandleAndValidateTestDirectoryScopes( + cmExecutionStatus& status, bool test_directory_option_encountered, + std::string& test_directory, cmMakefile*& test_directory_makefile); + std::string MakeSourceFilePathAbsoluteIfNeeded( cmExecutionStatus& status, const std::string& source_file_path, bool needed); void MakeSourceFilePathsAbsoluteIfNeeded( diff --git a/Tests/RunCMake/set_property/RunCMakeTest.cmake b/Tests/RunCMake/set_property/RunCMakeTest.cmake index 692c6b9..1a5498d 100644 --- a/Tests/RunCMake/set_property/RunCMakeTest.cmake +++ b/Tests/RunCMake/set_property/RunCMakeTest.cmake @@ -10,6 +10,12 @@ run_cmake(LINK_DIRECTORIES) run_cmake(LINK_LIBRARIES) run_cmake(SOURCES) run_cmake(SOURCE_FILE) +run_cmake(TEST-invalid) run_cmake(TYPE) run_cmake(USER_PROP) run_cmake(USER_PROP_INHERITED) + +set(RunCMake_TEST_BINARY_DIR "${RunCMake_BINARY_DIR}/TEST-build") +run_cmake(TEST) +set(RunCMake_TEST_NO_CLEAN 1) +run_cmake_command(TEST-test ${CMAKE_CTEST_COMMAND} -C Debug) diff --git a/Tests/RunCMake/set_property/TEST-invalid-result.txt b/Tests/RunCMake/set_property/TEST-invalid-result.txt new file mode 100644 index 00000


context:
space:
mode: