summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* unset: Add PARENT_SCOPE optionBrad King2013-10-083-2/+38
| | | | | | Add an unset() command option to remove a variable from the calling scope, just like the set() command's PARENT_SCOPE option. Teach the Unset test to cover such cases.
* Merge topic 'split-cmake-E'Brad King2013-10-077-1385/+1432
|\ | | | | | | | | c04995b cmake: Split -E command implementation into separate source file
| * cmake: Split -E command implementation into separate source fileBrad King2013-10-037-1385/+1432
| | | | | | | | | | | | | | | | | | | | | | Move the cmake::ExecuteCMakeCommand static method and all the static methods it calls out of the 'cmake' class to a separate 'cmcmd' class. Build the latter as part of the main cmake executable with cmakemain.cxx and not in CMakeLib. Drop unused header includes from "cmake.cxx". By moving this implementation out of cmake.cxx we avoid carrying it around in all the executables that use class 'cmake'. It is needed only for the main "cmake -E" functionality.
* | Merge topic 'test-Qt4-quiet'Brad King2013-10-071-1/+1
|\ \ | | | | | | | | | | | | a3170c8 Tests: Make find_package(Qt4) QUIET
| * | Tests: Make find_package(Qt4) QUIETBrad King2013-10-031-1/+1
| | | | | | | | | | | | | | | | | | The lack of Qt4 on a system should silently skip the corresponding tests with no other messages. This is already the case for other find_package calls in Tests/CMakeLists.txt.
* | | Merge topic 'IMPORTED-target-SYSTEM-includes'Brad King2013-10-077-1/+134
|\ \ \ | | | | | | | | | | | | | | | | a63fcbc Always consider includes from IMPORTED targets to be SYSTEM.
| * | | Always consider includes from IMPORTED targets to be SYSTEM.Stephen Kelly2013-09-247-1/+134
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Introduce a target property to control this behavior variable to set the default value for the target property. This does not affect try_compile runs.
* | | | Merge topic 'private-link-depends-are-package-private'Brad King2013-10-071-1/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 0ad2a1c Export: Never treat private link libraries as public package dependencies.
| * | | | Export: Never treat private link libraries as public package dependencies.Stephen Kelly2013-09-241-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Multiple libraries in a single buildsystem can be exported to multiple export-sets. If a library from one export set depends on a library from another export set, the export logic generates a check in the targets file to verify that the target in the other export set is found. That check is executed at downstream-find_package-time. However, a target may depend privately on a target in another export set. In that case, the depend used to also be listed in the required targets in the targets file. Change the export logic to ignore the private link entries instead.
* | | | | Merge topic 'fixDocumentationComment'Brad King2013-10-071-4/+5
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | e507bf2 CPack: Fix clang -Wdocumentation warnings
| * | | | | CPack: Fix clang -Wdocumentation warningsEric NOULARD2013-09-241-4/+5
| | | | | |
* | | | | | Merge topic 'add_cache_options_to_ccmake'Brad King2013-10-074-3/+168
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | fadffab ccmake: Teach dialog to support cache STRINGS property
| * | | | | | ccmake: Teach dialog to support cache STRINGS propertyBill Hoffman2013-10-074-3/+168
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit adds the ability to ccmake of cycling through cache options. This uses the STRINGS property of the cache entry. The enter key will cycle forward, and the right and left arrows will go up and down in the list.
* | | | | | | Merge topic 'UseJava-jar-manifest'Brad King2013-10-071-3/+13
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 69aff17 UseJava: Add support for the jar 'm' (Manifest) option
| * | | | | | | UseJava: Add support for the jar 'm' (Manifest) optionSimon Levermann2013-09-231-3/+13
| | | | | | | |
* | | | | | | | Merge topic 'deprecation-macro-refactor'Brad King2013-10-071-2/+8
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cdf55d5 GEH: Make each element of the deprecation macros overridable. 80d5090 GEH: Use the macro for the deprecation attribute after definiting it.
| * | | | | | | | GEH: Make each element of the deprecation macros overridable.Stephen Kelly2013-09-231-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This way, we can override only FOO_DEPRECATED to silence deprecation for a library.
| * | | | | | | | GEH: Use the macro for the deprecation attribute after definiting it.Stephen Kelly2013-09-231-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This way, it is more-easily overridden.
* | | | | | | | | Merge topic 'generate-modern-style'Brad King2013-10-0715-135/+136
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 027a020 Merge branch 'test-property-genex' into generate-modern-style 33055c4 Generate modern-style cmake code.
| * \ \ \ \ \ \ \ \ Merge branch 'test-property-genex' into generate-modern-styleBrad King2013-09-207-25/+112
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve conflict in Source/cmTestGenerator.cxx by taking "their" side (test-property-genex). It already accounts for the lower-case change in "our" side (generate-modern-style).
| * | | | | | | | | | Generate modern-style cmake code.Stephen Kelly2013-08-2215-136/+137
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The commits 9db31162 (Remove CMake-language block-end command arguments, 2012-08-13) and 77543bde (Convert CMake-language commands to lower case, 2012-08-13) changed most cmake code to use lowercase commands and no parameters in termination commands. However, those changes excluded cmake code generated in c++ by cmake. Make a similar style change to code generated by cmake.
* | | | | | | | | | | Merge topic 'test-property-genex'Brad King2013-10-077-25/+112
|\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6a47c37 add_test: Mention generator expressions in old-style add_test docs d331292 cmTestGenerator: Evaluate generator expressions in test properties 6fe5c4a cmTestGenerator: Separate test properties for each configuration
| * | | | | | | | | | add_test: Mention generator expressions in old-style add_test docsBen Boeckel2013-09-201-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The old-style add_test() call does not support generator expressions at all. This also applies to the properties for the test, but it is not mentioned at all.
| * | | | | | | | | | cmTestGenerator: Evaluate generator expressions in test propertiesBen Boeckel2013-09-206-3/+78
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is useful for cases like: add_test(NAME mytest COMMAND mydriver $<TARGET_FILE:myexe>) set_tests_properties(mytest PROPERTIES REQUIRED_FILES "$<TARGET_FILE:myexe>" WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/$<CONFIGURATION>" ) In this example we require the actual test executable to exist to run the test in addition to the test driver at argv[0]. Also the $<CONFIGURATION> expression improves over \${CTEST_CONFIGURATION_TYPE} because the latter is not normalized for case-sensitive filesystems.
| * | | | | | | | | | cmTestGenerator: Separate test properties for each configurationBrad King2013-09-201-22/+33
| |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move property generation from GenerateScriptConfigs to separate copies in GenerateOldStyle and GenerateScriptForConfig. This causes the per-config tests generated for the add_test(NAME) signature to each get their own test properties. This will allow us to later change the property values based on the test configuration. While at it, generate lower-case CMake code (e.g. set_tests_properties). Inspired-by: Ben Boeckel <mathstuf@gmail.com>
* | | | | | | | | | Merge topic 'doc-add_dependencies-direction'Brad King2013-10-071-6/+6
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1bdac7d add_dependencies: Clarify direction of dependency in docs (#14424)
| * | | | | | | | | | add_dependencies: Clarify direction of dependency in docs (#14424)Brad King2013-09-191-6/+6
| | |_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | State explicitly that the dependencies will build before the target. Drop wording that may imply the opposite. Suggested-by: Rob Stewart <robert.stewart@sig.com>
* | | | | | | | | | Merge topic 'EclipseFixWarningMessage'Brad King2013-10-071-19/+27
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5f11b8d Eclipse: add version 4.3 for completeness 2b63734 Eclipse: print different message if CMAKE_ECLIPSE_VERSION is already set 1ff8c21 CMakeFindEclipse: use lowercase for macro calls
| * | | | | | | | | | Eclipse: add version 4.3 for completenessAlex Neundorf2013-09-181-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This just adds the version number, there are no features depending on this. Alex
| * | | | | | | | | | Eclipse: print different message if CMAKE_ECLIPSE_VERSION is already setAlex Neundorf2013-09-181-17/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes #14422. Alex
| * | | | | | | | | | CMakeFindEclipse: use lowercase for macro callsAlex Neundorf2013-09-181-2/+2
| | |_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Alex
* | | | | | | | | | Merge topic 'cmListFileLexer-fix-leak-on-error'Brad King2013-10-072-0/+2
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ad3d5c5 cmListFileLexer: Fix leak on error before EOF
| * | | | | | | | | | cmListFileLexer: Fix leak on error before EOFBrad King2013-09-172-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Teach cmListFileLexerDestroy to call cmListFileLexerSetToken with a NULL token to free the token string buffer. Without this, if an error occurs before the token cleanup happens when EOF is reached, then the token string buffer may leak.
* | | | | | | | | | | Merge topic 'cleanup-properties'Brad King2013-10-074-16/+5
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b78bc33 Cleanup some variable documentation names bbfff52 Remove redundant cmake::GetIsPropertyDefined method
| * | | | | | | | | | | Cleanup some variable documentation namesBrad King2013-09-171-6/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove trailing whitespace after property names. Remove duplicate CMAKE_<LANG>_LINK_EXECUTABLE definition. Rename "[Project name]" placeholder to "<PROJECT-NAME>".
| * | | | | | | | | | | Remove redundant cmake::GetIsPropertyDefined methodBrad King2013-09-173-10/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We already have cmake::IsPropertyDefined for the same reason.
* | | | | | | | | | | | Merge topic 'mark_as_advanced'Brad King2013-10-071-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8cff5e4 mark_as_advanced: improve documentation syntax
| * | | | | | | | | | | | mark_as_advanced: improve documentation syntaxRolf Eike Beer2013-09-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Only one argument is required. Also avoid using the same variable name twice in the input list and follow the convention used elsewhere for optional arguments.
* | | | | | | | | | | | | Merge topic 'openssl-advanced'Brad King2013-10-071-0/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 864e2a3 FindOpenSSL: mark variables as advanced for MSVC (#14418)
| * | | | | | | | | | | | | FindOpenSSL: mark variables as advanced for MSVC (#14418)Rolf Eike Beer2013-09-171-0/+2
| |/ / / / / / / / / / / /
* | | | | | | | | | | | | Merge topic 'RunCMake-ignore-valgrind-lines'Brad King2013-10-071-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4953330 Tests/RunCMake: Tolerate valgrind lines in CMake output
| * | | | | | | | | | | | | Tests/RunCMake: Tolerate valgrind lines in CMake outputBrad King2013-09-161-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When RunCMake tests run during dynamic analysis, valgrind may add lines of the form "==[0-9]+==..." to the output. Remove such lines from the actual output before matching it against the expected output.
* | | | | | | | | | | | | | Merge topic 'cleanup-CTestTestMemcheck'Brad King2013-10-071-10/+27
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e8e67ae CTestTestMemcheck: Fix matching of malloc debug messages 8ea62fd CTestTestMemcheck: Tolerate trailing "==..." lines from valgrind f169f48 CTestTestMemcheck: Refactor output expectation regex generation
| * | | | | | | | | | | | | | CTestTestMemcheck: Fix matching of malloc debug messagesBrad King2013-09-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In commit 10bc50ea (Tests: ignore Guard Malloc messages in MemChecker tests, 2013-05-13) we forgot to escape backslashes in the CMake language to get them into the regex. Add them now.
| * | | | | | | | | | | | | | CTestTestMemcheck: Tolerate trailing "==..." lines from valgrindBrad King2013-08-161-1/+2
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | CTestTestMemcheck: Refactor output expectation regex generationBrad King2013-08-161-10/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor generation of PASS_REGULAR_EXPRESSION for tests CTestTestMemcheckDummyPurify CTestTestMemcheckDummyValgrind CTestTestMemcheckDummyValgrindPrePost CTestTestMemcheckDummyValgrindIgnoreMemcheck Avoid duplicating the normal ctest output matching expression. Use literal newlines instead of "\n" to improve readability. Integrate matching of guard-malloc lines at the end of the output with expressions matching tool output like lines for BullseyeCoverage.
* | | | | | | | | | | | | | | Merge topic 'fix-genex-preprocessing-incomplete-test'Brad King2013-10-072-0/+24
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2aafacc genex: Test preprocessing incomplete expressions.
| * | | | | | | | | | | | | | | genex: Test preprocessing incomplete expressions.Stephen Kelly2013-09-132-0/+24
| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge topic 'minor_cleanup'Brad King2013-10-074-6/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6931999 VS6: Add some delimiting between error message and content. d1a5f12 cmTarget: Fix typo in comment. 961c0ba Fix comments to match the code. 7cca50c Remove unused include.
| * | | | | | | | | | | | | | | | VS6: Add some delimiting between error message and content.Stephen Kelly2013-09-121-2/+2
| | | | | | | | | | | | | | | | |
generated by cgit v0.12 at 2024-11-12 19:52:28 (GMT)