summaryrefslogtreecommitdiffstats
path: root/Tests
Commit message (Collapse)AuthorAgeFilesLines
* CPack: Restore support for 0-valued version componentsBrad King2018-07-277-0/+24
| | | | | | | | | | | | | | In commit v3.12.0-rc1~136^2 (CPack: Use project version as default for `CPACK_PACKAGE_VERSION`, 2018-04-29) we did not account for the value of `CMAKE_PROJECT_VERSION_{MAJOR,MINOR,PATCH}` having `0`. Fix the logic to distinguish between unprovided version components and `0` components. While at it, add a test case covering the behavior described in the documentation by the original commit. The number of version components in the package name should match those provided to the `project()` command `VERSION` option. Fixes: #18199
* Merge branch 'revert-subdirectory-linking' into release-3.12Brad King2018-07-0315-94/+7
|\ | | | | | | Merge-request: !2191
| * Revert "target_link_libraries: Allow use with targets in other directories"Brad King2018-07-0315-94/+7
| | | | | | | | | | | | | | | | | | Revert commit v3.12.0-rc1~82^2 (target_link_libraries: Allow use with targets in other directories, 2018-05-11). The RHS target scoping and visibility rules are not clear and will need further investigation before the feature can be added. Issue: #17943
* | UseSWIG: reintroduce legacy target name managementMarc Chevrier2018-07-034-0/+4
|/ | | | Fixes: #18140
* Merge branch 'ctest_submit-https' into release-3.12Brad King2018-06-272-6/+9
|\ | | | | | | Merge-request: !2171
| * ctest_submit: show headers as debug infoZack Galbreath2018-06-272-6/+9
| | | | | | | | | | | | | | Hide any headers specified by `ctest_submit(HTTPHEADER ...)` unless ctest is run with --debug. This option is used to present bearer tokens to CDash. We do not want to inadvertently expose this secret data in the console output log.
* | Merge branch 'lexer-null' into release-3.12Brad King2018-06-264-0/+7
|\ \ | | | | | | | | | Merge-request: !2174
| * | ListFileLexer: Do not match null bytes in inputBrad King2018-06-264-0/+7
| |/ | | | | | | | | | | | | | | | | | | | | Extend the fix from commit v3.10.0-rc1~188^2 (ListFileLexer: fix heap-buffer-overflow on malicious input, 2017-08-26) to apply to all lexer token matches. Replace all `.` with `[^\0\n]`. Update all `[^...]` match expressions to not match `\0`. We cannot safely process null bytes in strings. Fixes: #18124
* | Merge branch 'file-GLOB-remove-new-errors' into release-3.12Brad King2018-06-226-11/+1
|\ \ | | | | | | | | | Merge-request: !2164
| * | file: Drop error cases added by CMake 3.12.0-rc1 to avoid regressionsBrad King2018-06-226-11/+1
| |/ | | | | | | | | | | | | | | | | Refactoring in commit v3.12.0-rc1~418^2~3 (Refactor HandleGlobCommand, 2018-02-13) introduced error diagnostics for argument combinations that were previously accepted. Restore acceptance to avoid regressing projects that used those combinations even if they do not make sense. Fixes: #18097
* | Merge branch 'xcode-10-legacy-build-system' into release-3.12Brad King2018-06-193-17/+22
|\ \ | | | | | | | | | Merge-request: !2151
| * | Tests: Do not use i386 architecture with Xcode 10 and aboveBrad King2018-06-192-17/+21
| | | | | | | | | | | | Xcode 10 dropped support for i386 builds.
| * | Tests: Teach RunCMake to ignore Xcode missing file type warningsBrad King2018-06-191-0/+1
| |/ | | | | | | | | | | | | | | | | | | Xcode 10 beta warns xcodebuild... warning: file type '::com.apple.instruments.instrdst' is based on missing file type 'default::com.apple.package' Teach RunCMake to drop such lines before matching against expected output.
* | FindCURL: Rename imported target to match upstream CURLBrad King2018-06-181-1/+1
|/ | | | | | | | | | | Upstream CURL provides imported target `CURL::libcurl`. Rename the target added by `FindCURL` to match. We don't need compatibility with the old name because it has never been in a CMake release (except a 3.12 release candidate). Suggested-by: Jakub Zakrzewski <slither.jz@gmail.com> Acked-by: Rolf Eike Beer <eike@sf-mail.de> Fixes: #18091
* UseSWIG: Add CSHARP variant for wrapper filesRishi Theivendran2018-06-124-0/+93
| | | | | Issue: #18065 Fixes: #18066
* Merge topic 'more-misc-typos'Brad King2018-06-053-3/+3
|\ | | | | | | | | | | | | | | be28106880 Fix misc. typos Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Alex Turbov <i.zaufi@gmail.com> Merge-request: !2130
| * Fix misc. typosluz.paz2018-06-043-3/+3
| | | | | | | | Found via `codespell` and `grep`
* | Merge topic 'ep-support-passing-var-ending-with-notfound'Brad King2018-06-054-2/+22
|\ \ | | | | | | | | | | | | | | | | | | 7ad5165c67 ExternalProject: Fix cache generation when args end with "-NOTFOUND" Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2127
| * | ExternalProject: Fix cache generation when args end with "-NOTFOUND"Jean-Christophe Fillion-Robin2018-06-044-2/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Generalize the fix in commit v3.11.0-rc4~8^2 (ExternalProject: Fix cache generation when last args ends with "-NOTFOUND", 2018-03-10) to work for any argument rather than just the last one. ExternalProject can now successfully generate the cache file when any (not only the last one) cache variable associated with either `CMAKE_CACHE_ARGS` or `CMAKE_DEFAULT_CACHE_ARGS` configure step option is set to a `<value>` ending with `-NOTFOUND`.
| * | Merge branch 'custom-command-expand-empty' into release-3.11Brad King2018-05-142-0/+2
| |\ \ | | | | | | | | | | | | Merge-request: !2074
* | \ \ Merge topic 'WriteBasicConfigFile_tests'Brad King2018-06-041-239/+894
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | | | | | | | | 56f45bb79d Refactor write_basic_package_version_file tests Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2122
| * | | Refactor write_basic_package_version_file testsDaniele E. Domenichelli2018-06-011-239/+894
| | | |
* | | | Revise C++ coding style using clang-format-6.0Kitware Robot2018-06-01214-1126/+1182
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Run the `clang-format.bash` script to update all our C and C++ code to a new style defined by `.clang-format`. Use `clang-format` version 6.0. * If you reached this commit for a line in `git blame`, re-run the blame operation starting at the parent of this commit to see older history for the content. * See the parent commit for instructions to rebase a change across this style transition commit.
* | | | clang-format.bash: update to clang-format-6.0Brad King2018-06-016-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update `.clang-format` with configuration to make the 6.0 format as close as possible to what 3.8 produced before. Then revise the style: * Indent preprocessor directives (a feature new since 3.8) * Add a newline and indentation before inheritance `:` and `,` Rename the Git attribute identifying the format to include the clang-format version number: `format.clang-format-6.0`. This will aid external infrastructure in knowing what version of the tool to run.
* | | | Tests/VSWinStorePhone: Do not format managed sourceBrad King2018-06-011-0/+1
| | | |
* | | | Merge topic 'autogen_autorcc_multi_config'Brad King2018-06-0111-0/+94
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5852acffa4 Autogen: Add AUTORCC configuration change test 41685c8ba0 Autogen: Let AUTORCC generate output for all configurations 2930a198f6 Autogen: Add lock file to AUTORCC commands Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2117
| * | | | Autogen: Add AUTORCC configuration change testSebastian Holtermann2018-05-3011-0/+94
| | | | |
* | | | | FindALSA: add testcaseRolf Eike Beer2018-05-314-0/+40
| |/ / / |/| | |
* | | | Merge topic 'vs-toolset-version'Brad King2018-05-3011-0/+44
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | 5f13168419 VS: Add option to select the version of the toolset used by VS 2017 Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Francisco Facioni <fran6co@gmail.com> Merge-request: !2093
| * | | VS: Add option to select the version of the toolset used by VS 2017Basil Fierz2018-05-2911-0/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add new `version=` parameter in the toolset setting to select the version. Add variable `CMAKE_VS_PLATFORM_TOOLSET_VERSION` to hold the version, if one is set (blank indicates default). Fixes: #17549
* | | | Merge topic 'parallel_build_option'Brad King2018-05-2917-0/+43
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | 1ab3881ec9 cmake: Add options for parallel builds to --build mode Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Henry Schreiner <henryschreineriii@gmail.com> Merge-request: !1962
| * | | cmake: Add options for parallel builds to --build modeFlorian Maushart2018-05-2517-0/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | While we already support `cmake --build . -- -j`, the options after `--` are specific to the native build tool. Add new options `--parallel [<N>]` and `-j [<N>]` to abstract this and map to the proper option for the native build tool.
* | | | Merge topic 'doxygen-all'Craig Scott2018-05-292-0/+52
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7b2f440e2b FindDoxygen: Add tests for ALL option 79b29b732c FindDoxygen: add optional ALL argument Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2099
| * | | | FindDoxygen: Add tests for ALL optionCraig Scott2018-05-272-0/+52
| | | | |
* | | | | Merge topic 'FindLua-conventional-paths'Brad King2018-05-259-0/+134
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f5d19260f9 FindLua: Search for lua.h using more conventional paths 9455512d22 FindLua: Add tests for this module Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2095
| * | | | | FindLua: Add tests for this moduleAlexander Grund2018-05-249-0/+134
| |/ / / /
* | | | | FindODBC: Add module to search for ODBC libraryMateusz Loskot2018-05-224-0/+40
|/ / / / | | | | | | | | | | | | Add tests for FindODBC module.
* | | | Merge topic 'PDBDirectoryGenExpression'Brad King2018-05-211-2/+8
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 79ca546ed2 Add generator expression support to PDB_OUTPUT_DIRECTORY target property Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2083
| * | | | Add generator expression support to PDB_OUTPUT_DIRECTORY target propertyMarian Klymov2018-05-211-2/+8
| | | | | | | | | | | | | | | | | | | | Fixes: #16365
* | | | | Merge topic 'autogen_register_info_files'Brad King2018-05-178-1/+92
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | 3715d0fbcf Tests: Add QtAutogen test for a low cmake_minimum_required version Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2077
| * | | | Tests: Add QtAutogen test for a low cmake_minimum_required versionSebastian Holtermann2018-05-168-1/+92
| | | | |
* | | | | target_link_libraries: Allow use with targets in other directoriesPatrick Stotko2018-05-1515-7/+94
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously the command did not allow naming targets on the LHS that were not created in the calling directory. Lift this restriction to enable more flexible use by projects. Fixes: #17943
* | | | Merge topic 'custom-command-expand-empty'Brad King2018-05-152-0/+2
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | 6e59491659 add_custom_{command,target}: Fix crash on empty expanded command Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2074
| * | | add_custom_{command,target}: Fix crash on empty expanded commandBrad King2018-05-142-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Our custom command generation logic assumes that all command lines have at least `argv0`. In `add_custom_{command,target}` we already check that at least a `COMMAND` was given, but using `COMMAND_EXPAND_LISTS` in combination with a generator expression that expands to an empty string may produce an empty command line. In this case simply add an empty string as a command to maintain our internal invariant. Fixes: #17993
* | | | Merge topic 'FindPkgConfig-LINK_LIBRARIES'Brad King2018-05-141-0/+12
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 92ac721a44 FindPkgConfig: export the list of found libraries also as variable Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2068
| * | | | FindPkgConfig: export the list of found libraries also as variableRolf Eike Beer2018-05-111-0/+12
| | | | |
* | | | | Merge topic 'cpack-nuget'Brad King2018-05-146-28/+81
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f739752ad6 CPack: Add NuGet support dd43e6fe89 Tests: Format `RunCPackVerifyResult.cmake` more consistently 43582cda57 Tests: Fix comment for finding dpkg tool Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1972
| * | | | CPack: Add NuGet supportAlex Turbov2018-05-116-2/+56
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Create a CPack generator that uses `nuget.exe` to create packages: https://docs.microsoft.com/en-us/nuget/what-is-nuget NuGet packages could be easily produced from a `*.nuspec` file (running `nuget pack` in the directory w/ the spec file). The spec filename does not affect the result `*.nupkg` name -- only `id` and `version` elements of the spec are used (by NuGet). Some implementation details: * Minimize C++ code -- use CMake script do to the job. It just let the base class (`cmCPackGenerator`) to preinstall everything to a temp directory, render the spec file and run `nuget pack` in it, harvesting `*.nupkg` files...; * Ignore package name (and use default paths) prepared by the base class (only `CPACK_TEMPORARY_DIRECTORY` is important) -- final package filename is a responsibility of NuGet, so after generation just scan the temp directory for the result `*.nupkg` file(s) and update `packageFileNames` data-member of the generator; * The generator supports _all-in-one_ (default), _one-group-per-package_ and _one-component-per-package_ modes.
| * | | | Tests: Format `RunCPackVerifyResult.cmake` more consistentlyAlex Turbov2018-05-091-24/+24
| | | | |
| * | | | Tests: Fix comment for finding dpkg toolAlex Turbov2018-05-091-2/+1
| | | | |