summaryrefslogtreecommitdiffstats
path: root/Tests
Commit message (Collapse)AuthorAgeFilesLines
* 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.
* | | | Merge topic 'ExternalProject-genex'Brad King2015-04-229-7/+52
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | b470d618 Help: Add notes for topic 'ExternalProject-genex' 0273ef14 ExternalProject: Allow generator expressions with LOG_* options (#15287) 7bd8cfb8 ExternalProject: Allow generator expressions in initial cache options 1cf43dcf Tests: Add case to cover ExternalProject with subdirectories
| * | | ExternalProject: Allow generator expressions with LOG_* options (#15287)Andrey Pokrovskiy2015-04-212-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | Use file(GENERATE) to write the logging wrapper scripts to evaluate generator expressions. Use a per-config script names in case the content varies by configuration.
| * | | ExternalProject: Allow generator expressions in initial cache optionsAndrey Pokrovskiy2015-04-216-7/+16
| | | | | | | | | | | | | | | | | | | | | | | | Use file(GENERATE) to write the initial cache file so that we can evaluate generator expressions. Use a per-config initial cache file name in case the content varies by configuration.
| * | | Tests: Add case to cover ExternalProject with subdirectoriesBrad King2015-04-213-0/+32
| | |/ | |/| | | | | | | | | | | | | | | | Add an ExternalProjectSubdir test directory with a minimal test showing use of ExternalProject_Add for a source tree in a subdirectory. This will allow us to easily add test external projects that cover specific behavior where the client project must check results.
* | | Merge topic 'fix-CTestTestSerialOrder-parallel-env'Brad King2015-04-221-0/+1
|\ \ \ | | | | | | | | | | | | | | | | 2f4b13b3 Tests: Protect CTestTestSerialOrder from environment (#15524)
| * | | Tests: Protect CTestTestSerialOrder from environment (#15524)Brad King2015-04-211-0/+1
| |/ / | | | | | | | | | Reported-by: Stephen Kelly <steveire@gmail.com>
* | | QtAutogen: Process 'rcc --list' stdout and stderr separately (#15523)Brad King2015-04-213-0/+15
|/ / | | | | | | | | | | | | | | | | | | The stderr may have warning messages. We should not treat these lines as resource files. However, we must still recognize error message lines for missing resource files that may be generated. Extend the QtAutogen test to cover a generated resource as the only one listed in a .qrc file. This causes 'rcc --list' to print a warning to stderr that we now intend to ignore.
* | Merge topic 'cmSystemTools-RunSingleCommand-stderr'Brad King2015-04-211-1/+1
|\ \ | | | | | | | | | | | | 356c26eb cmSystemTools: Teach RunSingleCommand to separate stdout and stderr
| * | cmSystemTools: Teach RunSingleCommand to separate stdout and stderrBrad King2015-04-201-1/+1
| |/ | | | | | | | | | | | | Extend the RunSingleCommand signature to capture stdout and stderr separately. Allow both to be captured to the same std::string to preserve existing behavior. Update all call sites to do this so that this refactoring does not introduce functional changes.
* | Merge topic 'cpack-rpm-refactored-file-listing'Brad King2015-04-213-1/+32
|\ \ | | | | | | | | | | | | | | | | | | cd953bf7 Help: Add notes for topic 'cpack-rpm-refactored-file-listing' 76080c32 CPackRPM content listing refactor 152e9b32 CPackRPM package content list code move
| * | CPackRPM content listing refactorDomen Vrankar2015-04-193-1/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | Refactoring of content list that removes use of find and sed to make listing algorithm more clear and remove external dependencies. Patch also limits man pages handling to locations listed in brp-compress rpm script by default - fixes bug report #14660.
* | | Merge topic 'ExternalProject-test-refactor'Brad King2015-04-216-58/+63
|\ \ \ | |_|/ |/| | | | | | | | 28429270 Tests: Delay RunCMake.ExternalProject case checks
| * | Tests: Delay RunCMake.ExternalProject case checksBrad King2015-04-206-58/+63
| |/ | | | | | | | | Use RunCMake "-check.cmake" scripts to check the generated initial cache file content so that the full generation process is completed.
* | Merge topic 'add-GreenHills-MULTI-generator'Brad King2015-04-2011-0/+90
|\ \ | | | | | | | | | | | | | | | | | | 66b641f4 Help: Add notes for topic 'add-GreenHills-MULTI-generator' 48004d9d Add a 'Green Hills MULTI' generator on Windows 051d8be1 cmLocalGenerator: Constify some cmTarget and cmGeneratorTarget arguments
| * | Add a 'Green Hills MULTI' generator on WindowsGeoff Viola2015-04-2011-0/+90
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Green Hills MULTI is an IDE for embedded real-time systems. The IDE's product page can be found here: http://www.ghs.com/products/MULTI_IDE.html It supports cross compiling on ARM, Intel x86, and other architectures with various operating systems. The IDE exists on Linux and Windows host systems, but CMake will currently only generate the project files on Windows host systems.
* | | Merge topic 'stable-xcode-projects'Brad King2015-04-201-2/+2
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6693590f Xcode: Refine quoting rules for Strings a6331eb8 Xcode: Let PrintComment decide if the comment is non-empty 6e8952c1 Xcode: PrintComment will prepend a whitespace itself before the comment 4bd2544b Xcode: Do not add whitespace after attribute group opening brace 5cb4c838 Xcode: Properly indent PBXFileReference and PBXBuildFile a723427b Xcode: Remove extra space in PBXProject comment 2fe8bca5 Xcode: Add comment after root object 2e0e205e Xcode: Indent using tabs 7b68c8df Xcode: Sort Xcode objects by Id
| * | Xcode: Refine quoting rules for StringsGregor Jasny2015-04-171-2/+2
| | | | | | | | | | | | | | | $ and . do not need to be quoted, but brackets and * must be to not confuse the Xcode parser.
* | | Merge topic 'ninja-autogen'Brad King2015-04-175-10/+25
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e8fdd5f1 QtAutogen: Workaround rcc CRCRLF newlines on Windows (#15459) 15f1a6b4 Tests/QtAutogen: Avoid touching files in the source tree 3f7c7c65 Tests/QtAutogen: Help Qt5Autogen test find Qt5 on Windows 26b5cc5e Tests/QtAutogen: Enable per-config source tests when possible 45566408 Tests/QtAutogen: Require CMake 3.1 to set policies everywhere
| * | | QtAutogen: Workaround rcc CRCRLF newlines on Windows (#15459)Brad King2015-04-164-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The 'rcc --list' operation may print newlines of the form CRCRLF, so strip any trailing CR characters found on each line. Update the Tests/QtAutogen test to use a resource named in a subdirectory. This causes 'rcc --list' to display a blank line and tests that it is correctly filtered out.
| * | | Tests/QtAutogen: Avoid touching files in the source treeBrad King2015-04-164-2/+5
| | | |
| * | | Tests/QtAutogen: Help Qt5Autogen test find Qt5 on WindowsBrad King2015-04-161-0/+8
| | | | | | | | | | | | | | | | Set CMAKE_PREFIX_PATH to tell find_package(Qt5) where to look.
| * | | Tests/QtAutogen: Enable per-config source tests when possibleBrad King2015-04-162-5/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Pass CMAKE_BUILD_TYPE into the test on generators that use it so that the per-config part of the test can activate as needed. Do not make the per-config part conditional on the Debug configuration because the generator expressions evaluate to empty in other configurations. Skip the per-config source case with the Ninja generator because it does not currently work. cmQtAutoGenerators::InitializeAutogenTarget needs to know the list of source files on a target, but generator expressions in the list cannot be evaluated until after CreateGeneratorTargets has been called. That cannot happen until after Autogen targets have been generated. It is a chicken-and-egg problem.
| * | | Tests/QtAutogen: Require CMake 3.1 to set policies everywhereBrad King2015-04-162-2/+2
| | | | | | | | | | | | | | | | | | | | We want CMP0020 set in the autorcc_depends test. Also the test should now only run when we can support per-config source files.
* | | | Merge topic 'FPHSA-updates'Brad King2015-04-173-6/+10
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 84f06d0c FPHSA: Document REQUIRED_VARS recommendation (#15352) a3ad275c FPHSA: Revise and format documentation d1a6d15b FPHSA: Always populate the ExactCase_FOUND variable (#15412).
| * | | | FPHSA: Always populate the ExactCase_FOUND variable (#15412).Stephen Kelly2015-04-173-6/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The UPPERCASE name was inconsistent with config-packages, the find_dependency macro, and even FPHSA itself, which expects components to be specified with names matching ExactCase. The FOUND_VAR was only permitted to have two possible values, and now both are set for compatibility. Document it as obsolete, and adjust the code for the same. Users of the variable should just remove it.
* | | | | Merge topic 'vs70-deprecate'Brad King2015-04-165-0/+13
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 7b8e7c4a Deprecate Visual Studio 7 generator (.NET 2002)
| * | | | | Deprecate Visual Studio 7 generator (.NET 2002)Brad King2015-04-155-0/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update documentation to mark the generator deprecated. Add a warning at the end of generation plus an option to turn off the warning.
* | | | | | Merge topic 'vs6-deprecate'Brad King2015-04-165-0/+15
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | 85c2626b Deprecate Visual Studio 6 generator