summaryrefslogtreecommitdiffstats
path: root/Tests
Commit message (Collapse)AuthorAgeFilesLines
* Revert "Qbs: Add new 'extra' generator for qbs project files"Brad King2015-05-211-15/+1
| | | | | | | | | | | | | | | | | | | This reverts commit f85db2f32358e6de921aba7d1cb8ecb81da934c0. Discussion by the QtCreator community at https://bugreports.qt.io/browse/QTCREATORBUG-13695 raises concerns about this particular approach to working with CMake projects using QtCreator. Also, the functionality and design of the QBS extra generator was never discussed on the CMake mailing list or with QtCreator developers. There may be better ways to make the two tools work together. In order to avoid committing to long-term support of this generator prior to such discussion taking place, revert it from CMake for now. We may restore this or use an alternative design based on results of such discussion.
* Merge topic 'ExternalProject_FixLog'Brad King2015-05-211-0/+35
|\ | | | | | | | | a0d620de ExternalProject: Fix log when the first arg of commands is "COMMAND" (#15567)
| * ExternalProject: Fix log when the first arg of commands is "COMMAND" (#15567)Daniele E. Domenichelli2015-05-201-0/+35
| |
* | Merge topic 'run-include-what-you-use'Brad King2015-05-2119-0/+63
|\ \ | |/ |/| | | | | | | ada5ffce Add options to run include-what-you-use with the compiler 67fa3da9 cmake: Add internal -E mode to run include-what-you-use with the compiler
| * Add options to run include-what-you-use with the compilerBrad King2015-05-1910-0/+49
| | | | | | | | | | | | Create a <LANG>_INCLUDE_WHAT_YOU_USE target property (initialized by a CMAKE_<LANG>_INCLUDE_WHAT_YOU_USE variable) to specify an IWYU command line to be run along with the compiler.
| * cmake: Add internal -E mode to run include-what-you-use with the compilerBill Hoffman2015-05-199-0/+14
| | | | | | | | | | | | | | | | Add an internal "cmake -E __run_iwyu" mode to wrap the compiler call. Run a given include-what-you-use command line with the compiler options and report a warning if it finds anything. Then run the real compiler. Co-Author: Brad King <brad.king@kitware.com>
* | Merge topic 'use-std-unordered_map'Brad King2015-05-196-6/+6
|\ \ | | | | | | | | | | | | | | | | | | d7923b82 Use std::unordered_map instead of hash_map where available. 820777af Tests: Don't rely on ordering of targets in maps. 921d74d8 AutoGen: Don't iterate over a container while populating it.
| * | Tests: Don't rely on ordering of targets in maps.Stephen Kelly2015-05-176-6/+6
| |/
* | Merge topic 'minor-cleanups'Brad King2015-05-194-0/+14
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 61d52e6e cmListFileBacktrace: Hide the context-stack implementation detail. a271f7f1 cmTarget: Simplify CMP0023 message loop. f4300cd4 cmTarget: Simplify output computation. 65a42849 cmTarget: Store context in stack only if different. 9645cba3 cmListFileContext: Implement EqualityComparable. 52a8d19c cmTarget: Store only cmListFileContext for CMP0023 handling. 59ba1215 cmTarget: Remove needless iteration. 18f810a8 cmListFileContext: Sort by line before file. e96b5d14 cmListFileContext: Implement LessThanComparable. 7eb0dfa0 cmMakefile: Use std::set::insert API to simplify CMP0054 handling. f9785e0c cmMakefile: Simplify CMP0054 handling. e17b5e42 cmMakefile: Add access to the top-level execution context. 1ec1bf9f if(): Test the effect of cmMakefileCall use in elseif() handling. 9b4aefad cmMakefile: Replace deques with vectors.
| * | if(): Test the effect of cmMakefileCall use in elseif() handling.Stephen Kelly2015-05-184-0/+14
| |/
* | Merge topic 'fix-function-missing-endforeach'Brad King2015-05-197-0/+32
|\ \ | |/ |/| | | | | 3a656065 Fix assertion failure on unmatched foreach in function (#15572)
| * Fix assertion failure on unmatched foreach in function (#15572)Brad King2015-05-187-0/+32
| | | | | | | | | | | | | | | | | | | | | | | | The lexical scope counting added by commit v3.2.0-rc1~332^2~1 (Track nested loop levels in CMake language with a stack of counters, 2014-11-18) forgot to account for scopes popped by error messages about unclosed scopes. Teach the error handler to pop the lexical scope it reports as unclosed. Re-order the lexical scope RAII object to be inside the variable scope RAII object scope so that the lexical scope is fully closed before we check assertions about variable scopes. Extend the RunCMake.Syntax test with a case covering this.
* | Merge topic 'refactor-cmLocalGenerator'Brad King2015-05-152-0/+17
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ce167b54 cmMakefile: Handle CMP0014 before configuring the generator. 7baef756 cmLocalGenerator: Assert that there is a parent. 63255342 cmMakefile: Remove redundant variable set. 894961af cmMakefile: Use the state to determine the parent directory. 115e9199 Use new top-level check abstraction. c5059c90 cmLocalGenerator: Add abstraction to check if top-level. b17686d2 cmGlobalGenerator: Move some flags from cmLocalGenerator. ed41a8e7 cmLocalGenerator: Port loops to cmState::Snapshot. 48a9e91b cmState: Add an accessor for Parent snapshot and a validity check. e7f7c2e2 cmLocalGenerator: Convert two recursive methods to loops. c5cb3a73 cmLocalGenerator: Get project directories from the cmState. 76b59831 cmLocalGenerator: Initialize state before creating cmMakefile. 34c9ee2e cmLocalGenerator: Require a global generator in the constructor. 3837c483 Tests: Add case for 'ctest' run with bad CTestTestfile b317b38d cmGlobalBorlandMakefileGenerator: Do not inherit from NMake generator 94867698 Don't use a cmLocalGenerator instance to call static methods. ...
| * | Tests: Add case for 'ctest' run with bad CTestTestfileBrad King2015-05-142-0/+17
| | |
* | | Merge topic 'disallow-install-of-export'Brad King2015-05-159-0/+49
|\ \ \ | | | | | | | | | | | | | | | | | | | | b85d3b66 install: Disallow installing export() result. 501c237a install: Use an intermediate filesVector variable.
| * | | install: Disallow installing export() result.Stephen Kelly2015-05-149-0/+49
| |/ /
* | | Merge topic 'fix-tests-in-usr-local'Brad King2015-05-155-1/+23
|\ \ \ | |/ / |/| | | | | | | | | | | d430cb7c Tests: Fix failures when running under the default install prefix (#15566) 332ee3e3 Tests: Fix CheckSourceTree test when build is under source (#15566)
| * | Tests: Fix failures when running under the default install prefix (#15566)Brad King2015-05-144-0/+12
| | | | | | | | | | | | | | | | | | | | | Fix test cases whose behavior differs when their source or build tree is under CMAKE_INSTALL_PREFIX by setting an install prefix under the build tree. Otherwise they may fail when run under the default install prefix (e.g. /usr/local).
| * | Tests: Fix CheckSourceTree test when build is under source (#15566)Brad King2015-05-141-1/+11
| | | | | | | | | | | | | | | | | | Since the build tree will populate content under the source tree the test cannot reliably check that the source tree is pristine. Simply skip most of the test in this case.
* | | FindHDF5: Add version supportAxel Huebl2015-05-131-2/+2
|/ / | | | | | | | | Detect the HDF5 version and set HDF5_VERSION just as we detect HDF5_IS_PARALLEL from the header already.
* | Merge topic 'ctest-no-make-i'Brad King2015-05-1215-1/+87
|\ \ | | | | | | | | | | | | | | | | | | 226df303 CTest: Stop telling 'make' to ignore errors with -i 28e7a135 Help: Fix build_command alternative signature docs 231601b6 build_command: Choose configuration consistently across signatures
| * | CTest: Stop telling 'make' to ignore errors with -iBrad King2015-05-1215-1/+87
| | | | | | | | | | | | Add policy CMP0061 to maintain compatibility for existing projects.
* | | Merge topic 'cpack-deb-component-dependencies'Brad King2015-05-126-1/+235
|\ \ \ | | | | | | | | | | | | | | | | | | | | 1237d5fa Help: Add notes for topic 'cpack-deb-component-dependencies' e3f522f6 CPack/DEB per component dependencies
| * | | CPack/DEB per component dependenciesRaffi Enficiaud2015-05-086-1/+235
| |/ / | | | | | | | | | Dependencies may now be set per component
* | | Merge topic 'cpack-not-running-tests'Brad King2015-05-122-19/+22
|\ \ \ | | | | | | | | | | | | | | | | 7c103be8 CPack: Enable DEB and RPM tests more reliably
| * | | CPack: Enable DEB and RPM tests more reliablyDomen Vrankar2015-05-122-19/+22
| |/ / | | | | | | | | | | | | | | | | | | CPack DEB and RPM generators were not used for some tests because CPACK_BINARY_DEB and CPACK_BINARY_RPM variable were not set. Fix this, simplify generator selection in CTEST_RUN_CPackComponentsForAll, and fix bugs that were detected after tests were run.
* | | Merge topic 'ExternalProject-improve-missing-source-error'Brad King2015-05-1210-0/+69
|\ \ \ | |/ / |/| | | | | | | | dcb18836 ExternalProject: Improve error when SOURCE_DIR is missing (#15560)
| * | ExternalProject: Improve error when SOURCE_DIR is missing (#15560)Brad King2015-05-0810-0/+69
| | | | | | | | | | | | | | | Mention the SOURCE_DIR that we checked and found empty or missing so that the user can see the full path to what we expected to find.
* | | execute_process: Improve stdout/stderr mergingBrad King2015-05-078-0/+56
|/ / | | | | | | | | | | | | Use the KWSys Process "MergeOutput" option to give the child process the same pipe (or file) for both stdout and stderr. This allows natural merging of stdout and stderr together instead of merging on arbitrary buffered read boundaries as before.
* | Merge topic 'vs-install-in-default-build'Brad King2015-05-074-1/+18
|\ \ | | | | | | | | | | | | | | | a6e4e73d VS: Add option to put INSTALL target in .sln default build 562e69dd Tests: Enable devenv tests on VS >= 10
| * | VS: Add option to put INSTALL target in .sln default buildRobert Goulet2015-05-064-0/+15
| | | | | | | | | | | | | | | Add a CMAKE_VS_INCLUDE_INSTALL_TO_DEFAULT_BUILD variable to control this behavior.
| * | Tests: Enable devenv tests on VS >= 10Brad King2015-05-041-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | The VSExcludeFromDefaultBuild have not been enabled on VS >= 10 since commit v3.0.0-rc1~260^2~9 (Tests: Simplify VSExcludeFromDefaultBuild configuration, 2013-11-14). Since commit v3.0.0-rc1~260^2~2 (VS: Add CMAKE_VS_(DEVENV|MSBUILD|MSDEV)_COMMAND variables, 2013-12-04) we can simply check the CMAKE_VS_DEVENV_COMMAND variable for a devenv tool to use for the test.
* | | CPack/DEB component dependency auto-discoveryRaffi Enficiaud2015-05-073-1/+101
|/ / | | | | | | Dependency auto-discovery can now be set per component
* | Merge topic 'test-RunCMake-parallel-make'Brad King2015-04-301-0/+3
|\ \ | | | | | | | | | | | | 703e7625 Tests: Protect RunCMake tests from MAKEFLAGS in environment (#15542)
| * | Tests: Protect RunCMake tests from MAKEFLAGS in environment (#15542)Brad King2015-04-291-0/+3
| | |
* | | Merge topic 'cpack-deb-component-description'Brad King2015-04-305-1/+221
|\ \ \ | | | | | | | | | | | | | | | | 2f0afffa CPackDEB component description
| * | | CPackDEB component descriptionRaffi Enficiaud2015-04-295-1/+221
| |/ / | | | | | | | | | | | | Support for setting different description for each component.
* | | if: Implement new IN_LIST operatorNils Gladitz2015-04-3010-0/+81
| | |
* | | Revert "add_custom_command: Diagnose MAIN_DEPENDENCY limitation."Nils Gladitz2015-04-3011-70/+0
|/ / | | | | | | | | | | | | | | | | | | | | | | This reverts commit 242c3966 (add_custom_command: Diagnose MAIN_DEPENDENCY limitation, 2015-03-09) and the follow up commit b372a99a (UseSWIG: Do not use MAIN_DEPENDENCY on custom commands, 2015-03-26). I misdiagnosed the underlying issue that prompted creation of policy CMP0057. The actual issue surfaces when a single custom command's MAIN_DEPENDENCY is listed in more than one target; this issue will have to be addressed independently.
* | Merge topic 'deterministic-CTest-tests'Brad King2015-04-282-0/+4
|\ \ | | | | | | | | | | | | bf24b6c5 Tests: Guard more CTest tests against parallel execution.
| * | Tests: Guard more CTest tests against parallel execution.Stephen Kelly2015-04-272-0/+4
| | |
* | | Merge topic 'test-ExportImport-AIX-GCC'Brad King2015-04-281-0/+1
|\ \ \ | | | | | | | | | | | | | | | | 4fc47424 Tests: Fix ExportImport on AIX with GCC
| * | | Tests: Fix ExportImport on AIX with GCCBrad King2015-04-231-0/+1
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The iface_test_bld gets the excludedFromAll include directory with "-isystem" because it is added indirectly through an imported target. On AIX with GCC the -isystem flag causes sources to be preprocessed as: # 3 "/.../excludedFromAll.h" 2 3 4 The flags after the file name are documented here: https://gcc.gnu.org/onlinedocs/cpp/Preprocessor-Output.html and the "4" flag says that following content is extern "C". This causes the excludedFromAll function to be declared as a C symbol and not mangled for C++, which fails to link later because the symbol is really provided as C++. Work around this by setting the NO_SYSTEM_FROM_IMPORTED target property on iface_test_bld. Somehow iface_test_exp does not end up with -isystem so we do not need this workaround for that target.
* | | Tests: Fix RunCMake.CTest to tolerate source line number changesBrad King2015-04-271-1/+1
|/ /
* | Merge topic 'cpack-deb-linitian-md5hash'Brad King2015-04-239-0/+434
|\ \ | | | | | | | | | | | | | | | 75b0e167 CPackDeb: Add basic package tests fdfe4586 CPackDeb: Fix lintian md5sum file warning
| * | CPackDeb: Add basic package testsRaffi Enficiaud2015-04-239-0/+434
| | | | | | | | | | | | | | | Tests of generated component based deb packages with lintian and dpkg. Also includes basic file name check.
* | | Merge topic 'deterministic-CTest-tests'Brad King2015-04-231-0/+3
|\ \ \ | | | | | | | | | | | | | | | | | | | | b5b20d20 ctest: Treat ENV{CTEST_OUTPUT_ON_FAILURE} as a boolean fcf9cf6c Tests: Make a CTest test deterministic.
| * | | Tests: Make a CTest test deterministic.Stephen Kelly2015-04-201-0/+3
| | | | | | | | | | | | | | | | The test expect sub-test not to run in parallel.
* | | | Merge topic 'ExternalProject-depend-INTERFACE'Brad King2015-04-229-0/+48
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | e1c6df39 ExternalProject: Allow dependencies on INTERFACE libraries c0502faa ExternalProject: Fix error message typo
| * | | | ExternalProject: Allow dependencies on INTERFACE librariesBrad King2015-04-229-0/+48
| | | | | | | | | | | | | | | | | | | | | | | | | Respect INTERFACE library property whitelist. Check that a target has type "UTILITY" before querying other properties.