summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* cmake: Teach '-E tar' to report errors copying dataRuslan Baratov2018-05-181-8/+18
| | | | | The `copy_data` function checks for errors but the caller ignored them. Simplify its return type and add a check to the caller.
* Merge branch 'release-3.11'Brad King2018-05-150-0/+0
|\
| * Merge branch 'fix-automoc-warnings' into release-3.11Brad King2018-05-152-8/+23
| |\ | | | | | | | | | Merge-request: !2066
* | \ Merge topic 'fix-automoc-warnings'Brad King2018-05-152-8/+23
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | 9672d81ca3 Qt4Macros: Don't AUTOMOC or AUTOUIC qt4-generated files 800b2fcf80 Qt4Macros: Use get_property/set_property Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2066
| * | Qt4Macros: Don't AUTOMOC or AUTOUIC qt4-generated filesMatthew Woehlke2018-05-152-0/+15
| | | | | | | | | | | | | | | | | | | | | Suppress AUTOMOC and AUTOUIC on files generated by Qt4 wrapping macros; particularly, those generated by `qt4_wrap_cpp`, `qt4_wrap_ui`, and `qt4_add_resources`. None of these should need AUTOMOC or AUTOUIC treatment, and CMP0071 makes it important to mark this explicitly.
| * | Qt4Macros: Use get_property/set_propertyMatthew Woehlke2018-05-151-8/+8
| | | | | | | | | | | | | | | Replace use of old-style {get,set}_source_file_properties with newer {get,set}_property.
* | | Merge branch 'release-3.11'Brad King2018-05-150-0/+0
|\ \ \ | | |/ | |/|
| * | Merge branch 'custom-command-expand-empty' into release-3.11Brad King2018-05-143-0/+10
| |\ \ | | | | | | | | | | | | Merge-request: !2074
| * \ \ Merge branch 'autogen_register_info_files' into release-3.11Brad King2018-05-141-0/+3
| |\ \ \ | | |_|/ | |/| | | | | | Merge-request: !2071
* | | | Merge topic 'autogen_register_info_files'Brad King2018-05-151-0/+3
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | e461a136c1 Autogen: Register generated dependency files Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2071
| * | | Autogen: Register generated dependency filesSebastian Holtermann2018-05-141-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | For CMP0058 record that rcc info files are generated by CMake. Fixes: #17985
* | | | Merge topic 'custom-command-expand-empty'Brad King2018-05-153-0/+10
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | 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-143-0/+10
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | CMake Nightly Date StampKitware Robot2018-05-151-1/+1
| | |
* | | Merge topic 'FindPkgConfig-LINK_LIBRARIES'Brad King2018-05-144-21/+47
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 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-114-21/+47
| | | |
* | | | Merge topic 'cuda-vs-cuda-device-runtime'Brad King2018-05-141-0/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a170a59a58 VS: Link CUDA binaries with the device runtime library 'cudadevrt' Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2062
| * | | | VS: Link CUDA binaries with the device runtime library 'cudadevrt'Brad King2018-05-111-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | According to https://docs.nvidia.com/cuda/nvrtc/index.html there are some cases where a CUDA binary "...must be linked against the CUDA device runtime (cudadevrt) library". When `nvcc` drives linking it automatically links to runtime libraries as follows: * -cudart=none: None * -cudart=shared: -lcudadevrt -lcudart * -cudart=static: -lcudadevrt -lcudart_static The `cudadevrt` library is the cuda device runtime library. It is always static so passing it to the linker when not necessary does not hurt anything. With Ninja and Makefile generators, we detect `cudadevrt` and either `cudart` or `cudart_static` libraries implied by `nvcc` and then add them to link lines driven by a host compiler. However, this does not work with the VS generator because the CUDA Toolkit Visual Studio integration does not use `nvcc` to link binaries and instead uses `link.exe` directly. Visual Studio project files (`.vcxproj`) for CUDA are expected to explicitly list the needed runtime libraries. Our VS generator already adds `cudart.lib` or `cudart_static.lib` based on the `-cudart=` flag. Update it to also add `cudadevrt.lib` as nvcc does. Fixes: #17988
* | | | | Merge branch 'release-3.11'Brad King2018-05-140-0/+0
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | Merge branch 'irsl-fortran-only-linux' into release-3.11Brad King2018-05-111-8/+10
| |\ \ \ \ | | | | | | | | | | | | | | | | | | Merge-request: !2061
* | \ \ \ \ Merge topic 'irsl-fortran-only-linux'Brad King2018-05-141-8/+10
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | 05ece372a6 IRSL: Fix Intel library list for ifort-only setups Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2061
| * | | | | IRSL: Fix Intel library list for ifort-only setupsChristian Pfeiffer2018-05-111-8/+10
| | |_|_|/ | |/| | | | | | | | | | | | | Fixes: #17727
* | | | | Merge topic 'update-kwsys'Brad King2018-05-144-15/+30
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 05d67d2545 Merge branch 'upstream-KWSys' into update-kwsys 55efd14733 KWSys 2018-05-11 (46da6b14) Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2064
| * \ \ \ \ Merge branch 'upstream-KWSys' into update-kwsysBrad King2018-05-114-15/+30
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | | | | | | | | | | | | | | * upstream-KWSys: KWSys 2018-05-11 (46da6b14)
| | * | | | KWSys 2018-05-11 (46da6b14)KWSys Upstream2018-05-114-15/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Code extracted from: https://gitlab.kitware.com/utils/kwsys.git at commit 46da6b14f03f27d8531f841b9f48c1fda452c915 (master). Upstream Shortlog ----------------- Kyle Edwards (2): 5b8bf75b INSTALL: move namelink into development component e5733515 Fix recent regression in installation of namelink luz.paz (1): 0e14a1a6 Misc. typos and whitespace fixes
* | | | | | Merge topic 'xml-element-enhance'Brad King2018-05-143-61/+57
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ff13b0cdc2 cmCTestLaunch: use cmXMLElement for XML generation Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2057
| * | | | | | cmCTestLaunch: use cmXMLElement for XML generationVitaly Stakhovsky2018-05-113-61/+57
| | | | | | | | | | | | | | | | | | | | | | | | | | | | class `cmXMLElement` enhanced with more members; its use demonstrated
* | | | | | | Merge topic 'findjpeg_static_fix'Brad King2018-05-141-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 322eab0429 FindJPEG: Add 'jpeg-static' to searched names Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2059
| * | | | | | | FindJPEG: Add 'jpeg-static' to searched namesMichael Hofmann2018-05-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A statically built libjpeg-turbo library will have a '-static' suffix; see the jpeg-static CMake target here: https://github.com/libjpeg-turbo/libjpeg-turbo/blob/1.5.3/CMakeLists.txt#L936 On Windows the resulting .lib file is called 'jpeg-static.lib'. Consider this name while searching.
* | | | | | | | Merge topic 'cpack-nuget'Brad King2018-05-1416-32/+860
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-1116-6/+835
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | |/ / / / / / | |/| | | | | |
* | | | | | | | CMake Nightly Date StampKitware Robot2018-05-141-1/+1
| | | | | | | |
* | | | | | | | CMake Nightly Date StampKitware Robot2018-05-131-1/+1
| | | | | | | |
* | | | | | | | CMake Nightly Date StampKitware Robot2018-05-121-1/+1
| |_|/ / / / / |/| | | | | |
* | | | | | | Merge topic 'vs-refactor'Brad King2018-05-112-110/+92
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a2b5acec3b cmVisualStudio10TargetGenerator: refactor Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2054
| * | | | | | | cmVisualStudio10TargetGenerator: refactorVitaly Stakhovsky2018-05-092-110/+92
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `WritePlatformConfigTag` moved to local `Elem` class; other improvements
* | | | | | | | Merge topic 'FindCUDA-sccache'Brad King2018-05-111-4/+4
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 53ffff2277 FindCUDA: Add support for sccache Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2050
| * | | | | | | | FindCUDA: Add support for sccacheWill Feng2018-05-091-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When `CMAKE_C_COMPILER` is `sccache`, pass plain `cl` as the host compiler to `nvcc`. Otherwise, `nvcc` does not accept it.
* | | | | | | | | Merge topic 'vs-fix-csharp-recompile'Brad King2018-05-111-0/+1
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 91754b4e60 VS: When not referencing output assembly do not try to copy it either Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2037
| * | | | | | | | | VS: When not referencing output assembly do not try to copy it eitherAndreas Schönle2018-05-091-0/+1
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When generating a `ProjectReference` with `ReferenceOutputAssembly` set to `false`, also set `CopyToOutputDirectory` to `Never`. Otherwise MSBuild might report a diagnostic like Project '<name>' is not up to date. CopyLocal reference '...\ZERO_CHECK' is missing from output location. and rebuild the referencing project unnecessarily.
* | | | | | | | | Merge branch 'release-3.11'Brad King2018-05-110-0/+0
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / | |/| | | | | | |
| * | | | | | | | Merge branch 'restore-imported-lib-alias-diagnostic' into release-3.11Brad King2018-05-103-2/+25
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !2058
| * \ \ \ \ \ \ \ \ Merge branch 'FindBoost-backport-python-deps' into release-3.11Brad King2018-05-091-34/+34
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !2045
* | \ \ \ \ \ \ \ \ \ Merge topic 'restore-imported-lib-alias-diagnostic'Brad King2018-05-113-2/+25
|\ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-103-2/+25
| | |_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 topic 'FindBoost-backport-python-deps'Brad King2018-05-111-34/+34
|\ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / | |/| | | | | | | / | |_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 81cc993f89 FindBoost: Backport versioned python dependencies for v1.35 to v1.66 557e68e1a3 FindBoost: Remove extra indentation in 1.65/1.66 dependency block Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2045
| * | | | | | | | FindBoost: Backport versioned python dependencies for v1.35 to v1.66Filip Matzner2018-05-091-20/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update `mpi_python##` and `numpy##` component dependencies to honor python version suffixes on components named by the caller. Although upstream Boost did not add version suffixes prior to version 1.67, it is commonly done by distros. Honor suffixes specified by project code. Projects must take responsibility for naming distro-specific component suffixes for versions prior to 1.67. Fixes: #17892, #17970
| * | | | | | | | FindBoost: Remove extra indentation in 1.65/1.66 dependency blockBrad King2018-05-081-16/+16
| |/ / / / / / /
generated by cgit v0.12 at 2025-01-08 03:42:40 (GMT)