summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
| | | | | | | | | | |
| * | | | | | | | | | cmTarget: Fix typo in comment.Stephen Kelly2013-09-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | compatiblity -> compatibility
| * | | | | | | | | | Fix comments to match the code.Stephen Kelly2013-09-111-2/+2
| | | | | | | | | | |
| * | | | | | | | | | Remove unused include.Stephen Kelly2013-09-111-1/+0
| | | | | | | | | | |
* | | | | | | | | | | Merge topic 'FixTypoInGraphvizDocs'Brad King2013-10-071-1/+1
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bbb0d6f CMakeGraphVizOptions.cmake: Fix typo in documentation
| * | | | | | | | | | | CMakeGraphVizOptions.cmake: Fix typo in documentationAlex Neundorf2013-09-111-1/+1
| |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Alex
* | | | | | | | | | | Merge topic 'cmake-gui-window-settings'Brad King2013-10-071-5/+4
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 81ea363 cmake-gui: save and restore the geometry and window state between sessions.
| * | | | | | | | | | | cmake-gui: save and restore the geometry and window state between sessions.Clinton Stimpson2013-09-101-5/+4
| | | | | | | | | | | |
* | | | | | | | | | | | Merge topic 'FindwxWidgets-msvc-x64'Brad King2013-10-071-0/+2
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 870f91e FindwxWidgets: Look in x64 directories for MSVC (#14393)
| * | | | | | | | | | | | FindwxWidgets: Look in x64 directories for MSVC (#14393)Marius Luca2013-09-101-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When compiling the 64 bit version of wxWidgets using nmake the library folders become vc_x64_lib and vc_x64_dll and can coexist with the win32 version.
* | | | | | | | | | | | | Merge topic 'authorative-LINK_LIBRARIES'Brad King2013-10-071-18/+46
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f01dc72 Use one authorative source of the LINK_LIBRARIES property.
| * | | | | | | | | | | | | Use one authorative source of the LINK_LIBRARIES property.Stephen Kelly2013-09-091-18/+46
| |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We populate and maintain a vector of structs to keep track of backtraces already, so no need to populate the Properties container additionally. For completeness, it is necessary to remove the condition for populating the vector for only valid library names and generator expressions. That condition is now determined when evaluating the generator expressions.
* | | | | | | | | | | | | Merge topic 'vs-compiler-id-tolerate-diagnostics'Brad King2013-10-071-1/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8c891f8 VS: Tolerate diagnostic output while detecting cl (#14387)
| * | | | | | | | | | | | | VS: Tolerate diagnostic output while detecting cl (#14387)Brad King2013-09-031-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the VS IDE build output setting Tools -> Options -> Projects and Solutions -> Build and Run -> MSBuild project output verbosity is set to "Diagnostic" the build output contains a " (TaskId:###)" suffix on the CMAKE_<lang>_COMPILER= line used to extract the compiler executable location. Strip this suffix before checking that the reported location exists.
* | | | | | | | | | | | | | Merge topic 'deprecate-add_compiler_export_flags'Brad King2013-10-071-13/+34
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0f3a666 GenerateExportHeader: Deprecate add_compiler_export_flags function.
| * | | | | | | | | | | | | | GenerateExportHeader: Deprecate add_compiler_export_flags function.Stephen Kelly2013-09-021-13/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is made obsolete by the CXX_VISIBILITY_PRESET and VISIBILITY_INLINES_HIDDEN target properties.
* | | | | | | | | | | | | | | Merge topic 'FindPython_versions'Brad King2013-10-072-14/+14
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | afd4f7f FindPython*: simplify version selection
| * | | | | | | | | | | | | | | FindPython*: simplify version selectionRolf Eike Beer2013-08-312-14/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CMake already provides the version components split into variables, no need to split them again.
* | | | | | | | | | | | | | | | Merge topic 'FindLua'Brad King2013-10-071-0/+153
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 89cfa20 Modules: add FindLua.cmake
| * | | | | | | | | | | | | | | | Modules: add FindLua.cmakeRolf Eike Beer2013-08-311-0/+153
| |/ / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a version agnostic variant of FindLua50.cmake and FindLua51.cmake.
* | | | | | | | | | | | | | | | Merge topic 'add-find_dependency-macro'Brad King2013-10-071-2/+37
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bb501a2 CMakePackageConfigHelpers: Add a find_dependency macro
| * | | | | | | | | | | | | | | | CMakePackageConfigHelpers: Add a find_dependency macroStephen Kelly2013-08-301-2/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This macro handles the EXACT, REQUIRED and QUIET options and sets an appropriate NOT_FOUND_MESSAGE for the package if a dependency is not found.