summaryrefslogtreecommitdiffstats
path: root/Tests
Commit message (Collapse)AuthorAgeFilesLines
* 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
| | | |
* | | | Merge topic 'restore-imported-lib-alias-diagnostic'Brad King2018-05-111-2/+8
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e567d7eb63 add_library: Restore error on alias of non-global imported target Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2058
| * | | | add_library: Restore error on alias of non-global imported targetBrad King2018-05-101-2/+8
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In commit v3.11.0-rc1~433^2~1 (Add support for IMPORTED GLOBAL targets to be aliased, 2017-09-14) we accidentally dropped the error on calling `add_library` to alias an imported target that is not globally visible. The `add_executable` command's equivalent check was properly updated. Restore the check in `add_library` with the same update. Also fix the test case accordingly. Fixes: #17982
| * | | Merge branch 'implicit-lib-gcceh-file' into release-3.11Brad King2018-04-161-0/+6
| |\ \ \ | | | | | | | | | | | | | | | Merge-request: !1967
| * \ \ \ Merge branch 'backport-fix-explicit-CMakeLists.txt' into release-3.11Brad King2018-04-136-0/+55
| |\ \ \ \ | | | | | | | | | | | | | | | | | | Merge-request: !1959
| * \ \ \ \ Merge branch 'cpack-trace-nullptr' into release-3.11Brad King2018-04-104-0/+13
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Merge-request: !1950
* | | | | | | ctest_start: read model from TAG fileKyle Edwards2018-05-0930-2/+127
| |_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change reworks ctest_start() so that simply calling ctest_start(APPEND) will read all the information from the TAG file. On top of that, it relaxes the argument parsing for ctest_start() to allow greater flexibility in the argument ordering, and the documentation for ctest_start() has been cleaned up.
* | | | | | Merge topic 'deprecate_static_managed_targets'Brad King2018-05-082-0/+11
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b7c2b2cd78 cmVisualStudio10TargetGenerator: add handling of static C# targets d244f2cad3 cmVisualStudio10TargetGenerator: add handling of manual /clr setting 1e5a8f882f cmVisualStudio10TargetGenerator: fix checking for managed target 8d7ffed048 cmVisualStudio10TargetGenerator: issue warning when adding static C# lib 73ee599a82 cmGeneratorTarget: make GetManagedType() return 'Native' for static targets Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2014
| * | | | | | cmVisualStudio10TargetGenerator: issue warning when adding static C# libMichael Stürmer2018-05-072-0/+11
| | |_|_|_|/ | |/| | | |
* | | | | | cmRST: Parse inline links and inline literalsBrad King2018-05-072-0/+8
|/ / / / / | | | | | | | | | | | | | | | | | | | | Render links as the link text only. Render literals as themselves. This is closer to what the Sphinx text generator does.
* | | | | Merge topic 'doc-xref-envvar'Brad King2018-05-042-0/+4
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 828e18bb3e cmRST: Add support for 'envvar' cmake domain role Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2038
| * | | | | cmRST: Add support for 'envvar' cmake domain roleBrad King2018-05-042-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was accidentally left out of commit 8acf46caf1 (Utilities/Sphinx: Add role and directive for 'envvar' in CMake domain, 2018-04-19).
* | | | | | Merge topic 'test-CheckSourceTree-in-source'Brad King2018-05-041-3/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 46fa1af514 Tests: Fix CheckSourceTree for in-source non-dashboard builds Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2025
| * | | | | | Tests: Fix CheckSourceTree for in-source non-dashboard buildsIsrael Blancas2018-05-031-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For in-source builds we must tolerate non-tracked files in the source tree. Previously we only tolerated them for dashboard builds during automated testing, but we should tolerate them for local user builds too. Fixes: #17868
* | | | | | | Merge topic 'genex-complang-not-loaded'Brad King2018-05-043-10/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4f82199bef Genex: Allow COMPILE_LANGUAGE to name a language that is not loaded Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2031
| * | | | | | | Genex: Allow COMPILE_LANGUAGE to name a language that is not loadedHenry Schreiner2018-05-033-10/+1
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Evaluate to false on `$<COMPILE_LANGUAGE:Lang>` if language `Lang` is not loaded. This is helpful in exported targets consumed in other projects that may not enable all the same languages. Fixes: #17952
* | | | | | | Merge topic 'feature/cpack-default-package-version'Craig Scott2018-05-034-0/+56
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | af1c48871c CPack: Use project version as default for `CPACK_PACKAGE_VERSION` Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Harry Mallon <hjmallon@gmail.com> Merge-request: !2020
| * | | | | | CPack: Use project version as default for `CPACK_PACKAGE_VERSION`Alex Turbov2018-05-024-0/+56
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Introduce `CMAKE_PROJECT_VERSION` and the corresponsing components: `CMAKE_PROJECT_VERSION_MAJOR`, `CMAKE_PROJECT_VERSION_MINOR`, `CMAKE_PROJECT_VERSION_PATCH` and `CMAKE_PROJECT_VERSION_TWEAK`. * `CPack` module use `CMAKE_PROJECT_VERSION_MAJOR`, `CMAKE_PROJECT_VERSION_MINOR` and `CMAKE_PROJECT_VERSION_PATCH` to initialize corresponsing CPack variables.
* | | | | | install: add test for new NAMELINK_COMPONENT parameterKyle Edwards2018-05-0313-1/+285
|/ / / / /
* | | | | Merge topic 'csharp_reference_imported_targets'Brad King2018-04-2618-0/+332
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | de549083e3 cmVisualStudio10TargetGenerator: warn if /clr flag is set manually 59ec7d50bd cmVisualStudio10TargetGenerator: fix for backward compatibility 663f5120f4 cmGlobalVisualStudioGenerator: remove TargetCanBeReferenced() 359544a907 add tests for using target_link_libraries() with imported managed targets 43571073e0 cmVisualStudio10TargetGenerator: store managed reference information in maps 16fec7e2fc cmVisualStudio10TargetGenerator: make some methods config aware f3c6828876 cmVisualStudio10TargetGenerator: /clr compatible flags for managed tgt f9042d807d remove TargetIsCSharpOnly() and use methods from cmGeneratorTarget ... Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1805
| * | | | | add tests for using target_link_libraries() with imported managed targetsMichael Stürmer2018-04-2418-0/+332
| | | | | |
* | | | | | Ninja: Avoid empty phony edges for target orderingBrad King2018-04-263-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit v3.9.0-rc1~230^2~2 (ninja: break unnecessary target dependencies, 2017-04-17) we unconditionally generate a phony edge for target ordering. It is needed in case a later target depends on it. However, if the phony edge has no inputs then `ninja -d explain` prints: ninja explain: output ... of phony edge with no inputs doesn't exist Furthermore the phony edge's output is considered dirty and can cause dependents to be incorrectly considered dirty. Avoid this by always generating at least one input to the target ordering phony edges. If we have no real dependencies just use a path that always exists. Fixes: #17942
* | | | | | Merge topic 'vs-dedup-custom-commands'Brad King2018-04-254-0/+31
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f59c33a763 VS: Generate a custom command only in the least dependent target d58d4daa6b cmVisualStudio10TargetGenerator: Use cmLocalVisualStudio10Generator Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1889
| * | | | | | VS: Generate a custom command only in the least dependent targetFujii Hironori2018-04-234-0/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If a custom command is assigned to multiple targets, generate the build rule only in the least-dependent `.vcxproj` file. Otherwise MSBuild will run the command on the first build of a dependent target even if its dependencies already brought the command up to date (in order to populates its build log). Generate targets in least-to-most-dependent order, and assign a custom command to the least dependent target. Added cmLocalVisualStudio10Generator::GenerateTargetsDepthFirst to call cmVisualStudio10TargetGenerator::Generate in least-dependent order. Moved SourcesVisited from cmVisualStudio10TargetGenerator to cmLocalVisualStudio10Generator to avoid attaching a custom command to multiple targets among the local generator. Fixes: #16767
* | | | | | | Merge topic 'Genex-TARGET_GENEX_PROPERTY'Brad King2018-04-2426-0/+219
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4d15046edd Genex: Add $<TARGET_GENEX_EVAL:...> and $<GENEX_EVAL:...> Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1984
| * | | | | | | Genex: Add $<TARGET_GENEX_EVAL:...> and $<GENEX_EVAL:...>Marc Chevrier2018-04-2326-0/+219
| | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | Fixes: #17884
* | | | | | | Merge topic 'reorder-sys-includes'Brad King2018-04-244-0/+7
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 76ad2ecb50 Order SYSTEM include directories after non-system directories Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1968
| * | | | | | | Order SYSTEM include directories after non-system directoriesEphi Sinowitz2018-04-234-0/+7
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | An effect of the `-isystem` flag is to search the directory after those specified via `-I` flags. Make behavior more consistent on compilers that do not have any `-isystem` flag by explicitly moving system include directories to the end.
* | | | | | | Merge topic 'FindMatlab/mcr-compatibility'Brad King2018-04-249-58/+146
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 59fb9e89b2 FindMatlab: Matlab Runtime Compiler support Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1970