summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'gtest-xml-output'Brad King2020-06-291-1/+1
|\ | | | | | | | | | | | | 75aa3ee7e7 GoogleTest: Fix name generation for XML_OUTPUT_DIR Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4942
| * GoogleTest: Fix name generation for XML_OUTPUT_DIRStefan Floeren2020-06-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Google test framework allows to write the results into an XML file since commit e9ab39eb1d (GoogleTest: Add XML_OUTPUT_DIR parameter, 2020-03-06, v3.18.0-rc1~538^2~2). This file is passed on the command line: `--gtest_output=xml:FILE_NAME`. The module allows to specify a directory to save those files with **TEST_XML_OUTPUT_PARAM**. If the option is set, the filename will be set to `${prefix}${pretty_suite}.${pretty_test}${suffix}.xml`. The pretty names contain parameters for the tests, if value-parameterized tests are used. These parameters may not be safe to use in file names. There are two possible options: 1. sanitize the file name 2. omit the values and use the internal numbering of gtest This commit chose option 2. The testname needs to be a valid C++ identifier and should therefore be reasonable for a filename. Note that the generated names contain slashes. This will lead to subdirectories, but works on both Linux and Windows. Fixes: #20877
* | Merge branch 'release-3.18'Brad King2020-06-290-0/+0
|\ \
| * \ Merge topic 'intel-c++20' into release-3.18Brad King2020-06-291-0/+10
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | 99c8dbf497 Intel: Add flags for C++20 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4946
* | \ \ Merge topic 'intel-c++20'Brad King2020-06-291-0/+10
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 85b151ff5b Merge branch 'backport-intel-c++20' into intel-c++20 99c8dbf497 Intel: Add flags for C++20 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4946
| * \ \ \ Merge branch 'backport-intel-c++20' into intel-c++20Brad King2020-06-261-0/+10
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | Intel: Add flags for C++20Brad King2020-06-261-0/+10
| | | |/ | | |/| | | | | | | | | | | | | Patch-by: Matheus Izvekov Fixes: #20880
* | | | CMake Nightly Date StampKitware Robot2020-06-291-1/+1
| | | |
* | | | CMake Nightly Date StampKitware Robot2020-06-281-1/+1
| | | |
* | | | CMake Nightly Date StampKitware Robot2020-06-271-1/+1
| | | |
* | | | Merge topic 'install-default-directory-permissions'Kyle Edwards2020-06-2623-0/+194
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d4812a955b cmake-install: implement default directory permissions Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4927
| * | | | cmake-install: implement default directory permissionsAsit Dhal2020-06-2523-0/+194
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | provide an argument for default directory permissions in cmake --install Fixes: #20700
* | | | | Merge topic 'visual-studio-android'Brad King2020-06-2637-79/+505
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6051a49c78 Visual Studio: Add Android support bbcaf9689e Refactor: Add IsAndroidGuiExecutable() method to cmTarget 14456923bd cmGlobalVisualStudio10Generator: Move variable initialization to header d5b5c19278 cmGlobalGenerator: FindMakeProgram() before CMakeDetermineSystem Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4898
| * | | | | Visual Studio: Add Android supportKyle Edwards2020-06-2434-63/+479
| | | | | |
| * | | | | Refactor: Add IsAndroidGuiExecutable() method to cmTargetKyle Edwards2020-06-183-5/+13
| | | | | |
| * | | | | cmGlobalVisualStudio10Generator: Move variable initialization to headerKyle Edwards2020-06-182-6/+3
| | | | | |
| * | | | | cmGlobalGenerator: FindMakeProgram() before CMakeDetermineSystemKyle Edwards2020-06-181-5/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prior to 147d36c, the build tool was found before the toolset was selected, but was changed to be found after in order to support a 64-bit MSBuild (introduced in da402a0.) However, a bug was found in 64-bit MSBuild, which resulted in da402a0 being reverted in f3cedf3 (but 147d36c was not reverted.) Move FindMakeProgram() even earlier than it was before 147d36c, before CMakeDetermineSystem is called, so that the Visual Studio Android support can report its sysroot, giving Android-Determine the information it needs to inspect the NDK. When the bug in 64-bit MSBuild is fixed, we will have a chicken-and- egg problem, but we don't need to worry about it for now.
* | | | | | Merge topic 'config_genex_support_multiple_types'Brad King2020-06-2613-36/+73
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | eae15dce6a Genex: $<CONFIG:> now supports multiple configurations c4cc21d20b cmVisualStudio10TargetGenerator: Do not segfault on empty config Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4924
| * | | | | | Genex: $<CONFIG:> now supports multiple configurationsRobert Maynard2020-06-2412-34/+70
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of having to do $<OR:$<CONFIG:Release>,$<CONFIG:MinSizeRel>> you can do $<CONFIG:Release,MinSizeRel>
| * | | | | | cmVisualStudio10TargetGenerator: Do not segfault on empty configRobert Maynard2020-06-241-2/+3
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | The VS generator should error out earlier when no configurations are specified, but for now cover this symptom.
* | | | | | Merge branch 'release-3.18'Brad King2020-06-260-0/+0
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | |
| * | | | | Merge topic 'GoogleTest-DISCOVERY_MODE-cleanups' into release-3.18Brad King2020-06-266-10/+8
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1458b4c048 Help: Add CMAKE_GTEST_DISCOVER_TESTS_DISCOVERY_MODE to release notes 642ea49115 GoogleTest: Replace SEND_ERROR with FATAL_ERROR 09c38e8de6 Tests: Don't ask for things not required for GoogleTest Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4938
* | \ \ \ \ \ Merge topic 'GoogleTest-DISCOVERY_MODE-cleanups'Brad King2020-06-266-10/+8
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1458b4c048 Help: Add CMAKE_GTEST_DISCOVER_TESTS_DISCOVERY_MODE to release notes 642ea49115 GoogleTest: Replace SEND_ERROR with FATAL_ERROR 09c38e8de6 Tests: Don't ask for things not required for GoogleTest Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4938
| * | | | | | Help: Add CMAKE_GTEST_DISCOVER_TESTS_DISCOVERY_MODE to release notesCraig Scott2020-06-241-1/+3
| | | | | | |
| * | | | | | GoogleTest: Replace SEND_ERROR with FATAL_ERRORCraig Scott2020-06-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | We want to fail and halt immediately upon any error, not continue past a fatal problem.
| * | | | | | Tests: Don't ask for things not required for GoogleTestCraig Scott2020-06-244-8/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The test cases only need C or C++, but not both. The CTest module is also not needed because we are not running a dashboard script.
* | | | | | | Merge branch 'release-3.18'Brad King2020-06-260-0/+0
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | Merge topic 'update-curl' into release-3.18Brad King2020-06-26173-4703/+8369
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e5ff413f41 curl: Set build options the way we need for CMake 0ef8fa5000 Merge branch 'upstream-curl' into update-curl 5717fdc114 curl 2020-06-23 (e9db32a0) 39f7cfad31 curl: Update script to get curl 7.71.0 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4937
* | | | | | | Merge topic 'update-curl'Brad King2020-06-26173-4703/+8369
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | / / | |_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e5ff413f41 curl: Set build options the way we need for CMake 0ef8fa5000 Merge branch 'upstream-curl' into update-curl 5717fdc114 curl 2020-06-23 (e9db32a0) 39f7cfad31 curl: Update script to get curl 7.71.0 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4937
| * | | | | curl: Set build options the way we need for CMakeBrad King2020-06-241-0/+6
| | | | | |
| * | | | | Merge branch 'upstream-curl' into update-curlBrad King2020-06-24172-4702/+8362
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream-curl: curl 2020-06-23 (e9db32a0)
| | * | | | | curl 2020-06-23 (e9db32a0)Curl Upstream2020-06-24172-4703/+8364
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Code extracted from: https://github.com/curl/curl.git at commit e9db32a09af03f27e86d1251a9e68e9b7486d371 (curl-7_71_0).
| * | | | | | curl: Update script to get curl 7.71.0Brad King2020-06-241-1/+1
| | |_|_|_|/ | |/| | | |
* | | | | | CMake Nightly Date StampKitware Robot2020-06-261-1/+1
| |_|_|_|/ |/| | | |
* | | | | CMake Nightly Date StampKitware Robot2020-06-251-1/+1
| | | | |
* | | | | Merge topic 'mkl-win32'Brad King2020-06-242-2/+6
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 56e645a4c3 Find{BLAS,LAPACK}: Add missing thread library for Intel MKL on Win32 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4936
| * | | | | Find{BLAS,LAPACK}: Add missing thread library for Intel MKL on Win32evatux2020-06-232-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The patch also updates the documentation to explicitly state that Intel10_32 stands for threaded case (linked with Intel OpenMP). Later, one may need to add Intel10_32_seq to support linking with the sequential version of Intel MKL. Fixes: #20857
* | | | | | CMake Nightly Date StampKitware Robot2020-06-241-1/+1
|/ / / / /
* | | | | Merge topic 'deprecate-pre-2.8.12'Craig Scott2020-06-2398-92/+253
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5845c218d7 Deprecate compatibility with CMake versions older than 2.8.12 7b07ccdd2b Tests/*Only: Update cmake_minimum_required versions 9b99b4bfc8 Tests/RunCMake: Update cmake_minimum_required versions fcea4a3b45 cmStateSnapshot: Invert CanPopPolicyScope return value to match name Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Ben Boeckel <ben.boeckel@kitware.com> Merge-request: !4897
| * | | | | Deprecate compatibility with CMake versions older than 2.8.12Brad King2020-06-1821-11/+171
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Issue a deprecation warning on calls to `cmake_minimum_required` or `cmake_policy` that set policies based on versions older than 2.8.12. Note that the effective policy version includes `...<max>` treatment. This is important in combination with commit ca24b70d31 (Export: Specify a policy range in exported files, 2020-05-16, v3.18.0-rc1~133^2).
| * | | | | Tests/*Only: Update cmake_minimum_required versionsBrad King2020-06-184-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | Use 3.3 or 2.8.12 where possible.
| * | | | | Tests/RunCMake: Update cmake_minimum_required versionsBrad King2020-06-1873-77/+76
| | | | | | | | | | | | | | | | | | | | | | | | Use 3.3 or 2.8.12 where possible.
| * | | | | cmStateSnapshot: Invert CanPopPolicyScope return value to match nameBrad King2020-06-182-2/+2
| | | | | |
* | | | | | Merge branch 'release-3.18'Brad King2020-06-230-0/+0
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | |
| * | | | | Merge topic 'doc-get_target_property' into release-3.18Brad King2020-06-231-5/+5
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f4b911a2c9 Help: Update docs for failure result of get_target_property Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4933
* | \ \ \ \ \ Merge topic 'doc-get_target_property'Brad King2020-06-231-5/+5
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f4b911a2c9 Help: Update docs for failure result of get_target_property Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4933
| * | | | | | Help: Update docs for failure result of get_target_propertyChristopher Tetreault2020-06-231-5/+5
| | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | If `get_target_property` fails to find a value for a non-inherited property, it appends `-NOTFOUND` to the var name and sets that as the result, rather than setting the value of the var to `NOTFOUND`.
* | | | | | Merge topic 'refactor_file_extension_queries'Brad King2020-06-2310-60/+52
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7628153edb Refactor file extension queries to be more consistent Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4925
| * | | | | | Refactor file extension queries to be more consistentRobert Maynard2020-06-2210-60/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It was very easy to forgot to check against all language file extensions. This updates the internal API to have a unified API.
* | | | | | | Merge topic 'refactor_language_mapping_logic'Brad King2020-06-231-52/+79
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c4e890946a try_compile: consistently add language properties 0e16da8233 cmCoreTryCompile use anonymous namespace instead of static Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4895