summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Tests: Add test for GoogleTest XML_OUTPUT_DIRStefan Floeren2020-07-014-0/+57
| | | | | Add tests to make sure the XML_OUTPUT_DIR is generated correctly and the correct files are getting created.
* Merge branch 'release-3.18'Brad King2020-06-300-0/+0
|\
| * Merge topic 'file-CONFIGURE-subdir' into release-3.18Brad King2020-06-306-3/+10
| |\ | | | | | | | | | | | | | | | | | | e5f5eeca2f file: Fix CONFIGURE output relative path Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4951
* | \ Merge topic 'file-CONFIGURE-subdir'Brad King2020-06-306-3/+10
|\ \ \ | | |/ | |/| | | | | | | | | | | | | e5f5eeca2f file: Fix CONFIGURE output relative path Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4951
| * | file: Fix CONFIGURE output relative pathBrad King2020-06-296-3/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | In commit a6fee09484 (file: Add CONFIGURE subcommand, 2020-03-06, v3.18.0-rc1~584^2) we accidentally treated relative path outputs with respect to the current working directory. Treat them with respect to the current binary directory instead. Fixes: #20885
* | | Merge topic 'find_vulkan_glslc'Brad King2020-06-305-6/+67
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 467509d767 FindVulkan: Support for finding glslc Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4944
| * | | FindVulkan: Support for finding glslcRyan Kawicki2020-06-275-6/+67
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The GLSL SPIR-V compiler is part of the Vulkan SDK and may be used by projects for compiling shaders as part of the build process. This is not strictly required to build a Vulkan application, which is why the variable is not part of the REQUIRED_VARs for the module.
* | | | Merge branch 'release-3.18'Brad King2020-06-300-0/+0
|\ \ \ \ | | |_|/ | |/| |
| * | | Merge topic 'find_library-file-readable' into release-3.18Brad King2020-06-305-3/+24
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f2c903fb9a find_library: Check that library files are readable Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4945
* | \ \ \ Merge topic 'find_library-file-readable'Brad King2020-06-305-3/+24
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | f2c903fb9a find_library: Check that library files are readable Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4945
| * | | | find_library: Check that library files are readableBrad King2020-06-295-3/+24
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactoring in commit 6b85166920 (ENH: Refactor find_library search logic, 2008-09-22, v2.8.0~1665) dropped a call to `FileExists` on the path under the assumption that the presence of a file in a directory listing means it exists. However, dropping that also dropped a check that verifies the file is readable. Restore the `FileExists` call to ensure that we only find readable libraries.
* | | | CMake Nightly Date StampKitware Robot2020-06-301-1/+1
| | | |
* | | | Merge topic 'fileApiAddLanguageStandardBacktrace'Brad King2020-06-2918-26/+479
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7d6861f367 fileapi: Extend codemodel targets with language standard ba835874a4 Add backtrace support for language standard e43486a639 cmGeneratorTarget: Clarify name of language property lookup helper Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4798
| * | | | fileapi: Extend codemodel targets with language standardJustin Goshi2020-06-2613-3/+360
| | | | |
| * | | | Add backtrace support for language standardJustin Goshi2020-06-225-15/+109
| | | | |
| * | | | cmGeneratorTarget: Clarify name of language property lookup helperJustin Goshi2020-06-222-8/+10
| | | | |
* | | | | Merge branch 'release-3.18'Brad King2020-06-290-0/+0
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | Merge topic 'file-ARCHIVE_CREATE-rename-TYPE-option' into release-3.18Brad King2020-06-2921-42/+57
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 95159b7dea file(ARCHIVE_CREATE): Rename TYPE option to COMPRESSION bc45bdc819 Help: Fix contents indenting for file(ARCHIVE_...) subcommands Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4948
* | \ \ \ \ Merge topic 'file-ARCHIVE_CREATE-rename-TYPE-option'Brad King2020-06-2921-42/+57
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 95159b7dea file(ARCHIVE_CREATE): Rename TYPE option to COMPRESSION bc45bdc819 Help: Fix contents indenting for file(ARCHIVE_...) subcommands Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4948
| * | | | | file(ARCHIVE_CREATE): Rename TYPE option to COMPRESSIONCraig Scott2020-06-2721-39/+54
| | | | | | | | | | | | | | | | | | Fixes: #20883
| * | | | | Help: Fix contents indenting for file(ARCHIVE_...) subcommandsCraig Scott2020-06-271-3/+3
| | | | | |
* | | | | | Merge branch 'release-3.18'Brad King2020-06-290-0/+0
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Merge topic 'gtest-xml-output' into release-3.18Brad King2020-06-291-1/+1
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 75aa3ee7e7 GoogleTest: Fix name generation for XML_OUTPUT_DIR Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4942
* | \ \ \ \ \ 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
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |