summaryrefslogtreecommitdiffstats
path: root/Tests
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'release-win64'Brad King2016-03-181-4/+7
|\ | | | | | | | | | | | | c089485d Utilities/Release: Skip spurious Qt5Autogen test for nightly binary e903a9fc Utilities/Release: Create a Windows 64-bit binary dd630075 Utilities/Release: Rename scripts to match target platform
| * Utilities/Release: Create a Windows 64-bit binaryBrad King2016-03-171-0/+3
| | | | | | | | | | | | | | | | | | | | | | Compile with `-D_WIN32_WINNT=0x502` to use a WinXP-compatible API. Compile with `-D_USING_V110_SDK71_` to tell the VS standard library headers that we are building with a WinXP-compatible Windows SDK. Link executables with `-subsystem:console,5.02` to make them runnable on Windows XP 64-bit. Ideally `cmake-gui` should instead be linked with `-subsystem:windows,5.02` but with the Ninja and Makefile generators CMake adds `-subsystem:windows` after our `-subsystem:console,5.02` flag and the linker seems to interpret this combination as we need.
| * Utilities/Release: Rename scripts to match target platformBrad King2016-03-171-4/+4
| | | | | | | | | | The machine name we happen to use for the build is less informative than its platform.
* | Merge topic 'GenerateExportHeader-fix-name-leak'Brad King2016-03-1814-42/+56
|\ \ | | | | | | | | | | | | | | | 6a6e5d89 GenerateExportHeader: Allow common NO_DEPRECATED_MACRO_NAME for multiple libs be5a8973 GenerateExportHeader: Do not define DEFINE_NO_DEPRECATED (#16022)
| * | GenerateExportHeader: Do not define DEFINE_NO_DEPRECATED (#16022)Andreas Schuh2016-03-1714-42/+56
| |/ | | | | | | | | | | Previously we allowed this definition to persist outside our header. This would cause conflicts across multiple such headers because the name was always the same. Fix this by avoiding the definition altogether.
* | Merge topic 'ios-install-combined-one-arch'Brad King2016-03-173-0/+64
|\ \ | |/ |/| | | | | e3fc2899 Fix iOS combined feature for single architecture targets
| * Fix iOS combined feature for single architecture targetsRuslan Baratov2016-03-153-0/+64
| | | | | | | | | | | | | | If list of valid target architectures is empty for given SDK then there will be no VALID_ARCHS build setting returned by Xcode. Return "" (empty string) explicitly in this case. This may happens if CMAKE_IOS_INSTALL_COMBINED is ON but only one architecture used in target.
| * Merge branch 'fix-static-private-non-target-depends' into releaseBrad King2016-02-175-0/+17
| |\
| * \ Merge branch 'fix-cmake_parse_arguments-expansion' into releaseBrad King2016-02-121-0/+19
| |\ \
| * \ \ Merge branch 'fix-install-EXPORT-crash' into releaseBrad King2016-02-087-3/+14
| |\ \ \
| * \ \ \ Merge branch 'test-ctest_submit-update' into releaseBrad King2016-02-084-4/+4
| |\ \ \ \
* | \ \ \ \ Merge topic 'FindProtobuf-variable-case'Brad King2016-03-111-2/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | a7b09e7f FindProtobuf: Rename variables to match case of module name
| * | | | | | FindProtobuf: Rename variables to match case of module nameAntonio Perez Barrero2016-03-071-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use recommended case for variable names. i.e. matching name of the module as passed to `find_package`. For backwards compatibility, the upper case versions of both input and output variables are used and defined when appropriate. Skip this for the _FOUND variable because FPHSA already does it. Skip this for the _VERSION variable because that was recently added and never available with the old name in a release of CMake.
* | | | | | | Merge topic 'remove-vs6-generator'Brad King2016-03-1030-148/+42
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b42866a3 Drop Visual Studio 6 generator cd9ba3ec cmLocalVisualStudio7Generator: Fix name of helper function
| * | | | | | | Drop Visual Studio 6 generatorBrad King2016-03-0930-148/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This generator has been deprecated since CMake 3.3. Remove it. Update documentation, modules, and tests to drop content specific to this generator.
* | | | | | | | Merge topic 'vs-clang-cl'Brad King2016-03-109-2/+133
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 491b41dd Help: Add notes for topic 'vs-clang-cl' ad6d27ac Tests: do not build PrecompiledHeader on Clang/C2 a0f0541f Tests: fix PDBDirectoryAndName on Clang/C2 3541af67 Tests: fix Plugin building on Clang/C2 1902c293 Tests: fix complexOneConfig building on Clang/C2 cab2ec11 Tests: fix Complex building on Clang/C2 ada3736c Tests: fix Module.GenerateExportHeader building on Clang/C2 123b7e13 Tests: fix AliasTarget building on Clang/C2 445d4d4b VS 14: Add flag map for -std= to CppLanguageStandard tag in project files 0a785eb4 Features: Clang has no cxx_decltype_incomplete_return_type in MSVC sim mode 2c2ec488 VS: in Clang/C2 toolset, setup correct compiler settings 37afe00f CMakeDetermineCompilerId: Add detection of clang.exe bundled with VS
| * | | | | | | | Tests: do not build PrecompiledHeader on Clang/C2Mariusz Pluciński2016-03-101-1/+3
| | | | | | | | |
| * | | | | | | | Tests: fix PDBDirectoryAndName on Clang/C2Mariusz Pluciński2016-03-101-0/+9
| | | | | | | | |
| * | | | | | | | Tests: fix Plugin building on Clang/C2Mariusz Pluciński2016-03-101-0/+7
| | | | | | | | |
| * | | | | | | | Tests: fix complexOneConfig building on Clang/C2Mariusz Pluciński2016-03-101-0/+7
| | | | | | | | |
| * | | | | | | | Tests: fix Complex building on Clang/C2Mariusz Pluciński2016-03-101-0/+7
| | | | | | | | |
| * | | | | | | | Tests: fix Module.GenerateExportHeader building on Clang/C2Mariusz Pluciński2016-03-103-1/+93
| | | | | | | | |
| * | | | | | | | Tests: fix AliasTarget building on Clang/C2Mariusz Pluciński2016-03-101-0/+7
| |/ / / / / / /
* | | | | | | | Xcode: ReRunCMake even if files disappeared (#15992)Gregor Jasny2016-03-091-0/+39
|/ / / / / / /
* | | | | | | Merge topic 'add-FindLTTngUST'Brad King2016-03-095-1/+64
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a4194deb Add FindLTTngUST module to find LTTng-UST library
| * | | | | | | Add FindLTTngUST module to find LTTng-UST libraryPhilippe Proulx2016-03-075-1/+64
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also detect the library version number. Provide results as variables and as an imported target, LTTng::UST. Signed-off-by: Philippe Proulx <eeppeliteloop@gmail.com>
* | | | | | | Diagnose recursive project/enable_language without crashing (#15999)Brad King2016-03-0711-0/+27
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Calling `project()` or `enable_language()` from a toolchain file will infinitely recurse since those commands load the toolchain file. Diagnose and reject this case with an error message instead of crashing when the stack eventually overflows.
* | | | | | Merge topic 'update-osx-release'Brad King2016-03-071-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | b682debd Utilities/Release: Switch to OS X 10.7 and Qt 5.5 for Mac binary
| * | | | | | Utilities/Release: Switch to OS X 10.7 and Qt 5.5 for Mac binaryBrad King2016-02-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use a new build machine to produce the OS X binary targeting OS X 10.7 and using Qt 5.5.
* | | | | | | VS: Add option to set `ConfigurationType` of a .vcxproj fileFabian Otto2016-02-266-0/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a VS_CONFIGURATION_TYPE target property to set this value explicitly. This is useful to build a Windows Kernel Mode Driver, for example.
* | | | | | | Merge topic 'try_compile-target-type'Brad King2016-02-267-0/+41
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7f1bd9fe try_compile: Add option to control type of target
| * | | | | | | try_compile: Add option to control type of targetBrad King2016-02-197-0/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Create a `CMAKE_TRY_COMPILE_TARGET_TYPE` option to specify use of `add_library(... STATIC ...)` for the generated test project. This will be useful for cross-compiling toolchains that cannot link a binary without custom flags or scripts.
* | | | | | | | file(DOWNLOAD): Fill STATUS variable on hash mismatch (#15987)Brad King2016-02-255-0/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Although we fail with an error on a hash mismatch, it is not a fatal error so the script may continue processing. If the download itself had no error then report in the STATUS variable that the operation was not successful due to the hash mismatch. Suggested-by: Tobias Hieta <tobias@hieta.se>
* | | | | | | | cmake_parse_arguments: Additional regression testsDimitar Yordanov2016-02-242-0/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add regression tests for the arguments handling in cmake_parse_arguments. The tests were run also against cmake 3.4.1 maint branch to verify that there are no regressions. Signed-off-by: Dimitar Yordanov <dimitar.yordanov@sap.com> Signed-off-by: Matthias Maennich <matthias.maennich@sap.com>
* | | | | | | | Merge topic 'test-XCTest-sdkroot'Brad King2016-02-241-1/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d8cba536 Tests: Fix XCTest when ENV{SDKROOT} is set
| * | | | | | | | Tests: Fix XCTest when ENV{SDKROOT} is setBrad King2016-02-191-1/+1
| | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We use the host OS X version as the deployment target for this test. This breaks if the SDKROOT environment variable specifies an incompatible SDK version. Explicitly specify `macosx` as the SDK so that CMake will automatically select a version matching the deployment target.
* | | | | | | | Merge topic 'test-FindPackageModeMakefileTest-optionally'Brad King2016-02-241-1/+2
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c05678ad Tests: Add option to disable FindPackageModeMakefileTest
| * | | | | | | | Tests: Add option to disable FindPackageModeMakefileTestBrad King2016-02-191-1/+2
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This test does not work in all environments, so add an option to disable it.
* | | | | | | | Merge topic 'revert-automoc-src-per-dir'Brad King2016-02-245-27/+1
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | 091b649e Revert "Automoc: Fix support of files with the same name (#12873)"
| * | | | | | | Revert "Automoc: Fix support of files with the same name (#12873)"Brad King2016-02-195-27/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 9beb2744d7685fca9cd5717308d4457dffdefcdc. Our AUTOMOC documentation states that it should be possible to `#include "moc_foo.cpp"` in `foo.cpp`, and this will not work if the file is placed in a different directory. Another solution will need to be found to the original problem. Reported-by: Stephen Kelly <steveire@gmail.com>
* | | | | | | | Merge topic 'unix-timestamps'Brad King2016-02-192-0/+28
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | 6727270b CMake: Extend TIMESTAMP sub-commands with new unix time format specifier
| * | | | | | | CMake: Extend TIMESTAMP sub-commands with new unix time format specifierJose-Luis Blanco-Claraco2016-02-182-0/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The new `%s` format specifier is substituted by file()/string() `TIMESTAMP` sub-commands with the number of seconds since unix-epoch (1970-01-01 00:00:00 UTC). Co-Author: Nils Gladitz <nilsgladitz@gmail.com>
* | | | | | | | Merge topic 'fix-static-private-non-target-depends'Brad King2016-02-185-0/+17
|\ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | 87f44b75 Fix export of STATIC library PRIVATE non-target dependencies
| * | | | | | | Fix export of STATIC library PRIVATE non-target dependenciesBrad King2016-02-175-0/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In commit v3.5.0-rc1~43^2 (Fix export of STATIC library PRIVATE dependencies with CMP0022 NEW, 2016-01-15) we taught target_link_libraries to generate `$<LINK_ONLY:$<TARGET_NAME:dep>>` in INTERFACE_LINK_LIBRARIES instead of `$<LINK_ONLY:dep>` so that `dep` can be recognized as a target name and updated during export. However, this approach does not work when `dep` is just a plain library name and not a target because `$<TARGET_NAME:...>` requires the name of a reachable target. Since we do not know during target_link_libraries whether the name will correspond to a reachable target or not, we cannot inject the `$<TARGET_NAME:...>` expression. Revert this change and solve the original problem instead by teaching the export logic to recognize and update target names directly in `$<LINK_ONLY:...>` expressions. Reported-by: Ben Boeckel <ben.boeckel@kitware.com>
* | | | | | | | Merge topic 'automoc-src-per-dir'Brad King2016-02-185-1/+27
|\ \ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | 9beb2744 Automoc: Fix support of files with the same name (#12873)
| * | | | | | | Automoc: Fix support of files with the same name (#12873)Mariusz Pluciński2016-02-165-1/+27
| | |/ / / / / | |/| | | | |
* | | | | | | FindProtobuf: check versionAntonio Perez Barrero2016-02-161-0/+1
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Check found libraries version to match user required version. Protobuf compiler executable version is checked to be aligned with found libraries, raising a warning message otherwise.
* | | | | | Merge topic 'fix-cmake_parse_arguments-expansion'Brad King2016-02-161-0/+19
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | | | | | | | | | | | | | | c8c45a2c cmake_parse_arguments: Restore ;-list argument flattening
| * | | | | cmake_parse_arguments: Restore ;-list argument flatteningDimitar Yordanov2016-02-121-0/+19
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The re-implementation in commit v3.5.0-rc1~116^2~1 (CMakeParseArguments: replace by native cmake_parse_arguments command, 2015-12-05) introduced a regression when parsing the ARGN arguments with cmake_parse_arguments. The original implementation used foreach(currentArg ${ARGN}) to iterate over input arguments. This flattened ;-lists within the arguments whether they were quoted or not. Fix our new implementation to preserve this behavior and add a test case to cover it. Signed-off-by: Dimitar Yordanov <dimitar.yordanov@sap.com> Signed-off-by: Matthias Maennich <matthias.maennich@sap.com>
* | | | | Merge topic 'cpack-rpm-upper-cased-components'Brad King2016-02-1610-23/+105
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 7c7efd1e CPack/RPM support for upper cased component variables