summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* FindPkgConfig: export the list of found libraries also as variableRolf Eike Beer2018-05-114-21/+47
|
* 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
| |/ / / /
* | | | | CMake Nightly Date StampKitware Robot2018-05-111-1/+1
| | | | |
* | | | | Merge topic 'ctest-start-args-rework'Craig Scott2018-05-1035-53/+312
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9deaf07597 Help: add release notes for ctest_start() changes 563781099f ctest_start: read model from TAG file Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2036
| * | | | | Help: add release notes for ctest_start() changesKyle Edwards2018-05-091-0/+7
| | | | | |
| * | | | | ctest_start: read model from TAG fileKyle Edwards2018-05-0934-53/+305
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | CMake Nightly Date StampKitware Robot2018-05-101-1/+1
| | | | |
* | | | | Merge topic 'doc-cpack-revise'Brad King2018-05-091-330/+339
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bfb91ff7f2 CPack: Add more markup to module documentation 5fc59ea7c8 CPack: Document `CPACK_PACKAGE_DESCRIPTION` variable 3f354d65b4 CPack: Move CPACK_BINARY_<GENNAME> with rest of docs 53ec402069 CPack: Convert documentation to long-bracket comment syntax Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2051
| * | | | CPack: Add more markup to module documentationAlex Turbov2018-05-081-174/+174
| | | | | | | | | | | | | | | | | | | | Also indent variable docs consistently.
| * | | | CPack: Document `CPACK_PACKAGE_DESCRIPTION` variableAlex Turbov2018-05-081-3/+11
| | | | |
| * | | | CPack: Move CPACK_BINARY_<GENNAME> with rest of docsAlex Turbov2018-05-081-10/+10
| | | | |
| * | | | CPack: Convert documentation to long-bracket comment syntaxAlex Turbov2018-05-081-320/+321
| | |_|/ | |/| | | | | | | | | | Use `#[===...==[.rst:` comments for docs.
* | | | Merge topic 'vs-refactor-xml'Brad King2018-05-091-1/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0bd1d1fcc4 VS: Fix regression in XML generation for CUDA Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2053
| * | | | VS: Fix regression in XML generation for CUDABrad King2018-05-081-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactoring in commit 3f315dc128 (cmVisualStudio10TargetGenerator: XML refactoring, 2018-05-02) accidentally left the `<Import>` element for the CUDA build customizations unclosed.
* | | | | CMake Nightly Date StampKitware Robot2018-05-091-1/+1
| | | | |
* | | | | Merge branch 'release-3.11'Brad King2018-05-080-0/+0
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | Merge branch 'FindCUDA-revert-sepcomp-cublas' into release-3.11Brad King2018-05-081-2/+2
| |\ \ \ \ | | | | | | | | | | | | | | | | | | Merge-request: !2048
| * \ \ \ \ Merge branch 'doc-updates' into release-3.11Brad King2018-05-082-3/+11
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Merge-request: !2043
| * \ \ \ \ \ Merge branch 'java-new-packaging-fixes' into release-3.11Brad King2018-05-082-3/+3
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !2042
* | \ \ \ \ \ \ Merge topic 'pkgconf-imp-target-lib-path'Brad King2018-05-081-2/+6
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ac5731a7e3 FindPkgConfig: correct library search path for imported targets. Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2027
| * | | | | | | | FindPkgConfig: correct library search path for imported targets.Aleksandr Mezin2018-05-011-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `-L` in LDFLAGS doesn't mean that standard search paths should be excluded. Example: $ pkg-config --libs libmutter-2 -L/usr/lib/mutter -lmutter-2 -lgtk-3 -lgdk-3 -lmutter-clutter-2 -lcairo-gobject -latk-1.0 -lpangocairo-1.0 -lpango-1.0 -lfribidi -ljson-glib-1.0 -lgio-2.0 -lwayland-egl -lwayland-client -lXtst -lXi -lmutter-cogl-2 -lcairo -lgmodule-2.0 -pthread -lgdk_pixbuf-2.0 -lgobject-2.0 -lglib-2.0 -lgbm -ldrm -lwayland-server -lEGL -lXext -lXdamage -lXfixes -lXcomposite -lXrandr -lX11 Most of these libraries are located at standard paths, not in `/usr/lib/mutter`. Fixes: #17954
* | | | | | | | | Merge topic 'vs-improve-options'Brad King2018-05-082-124/+99
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e76a0c6071 VS: improve options generation Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2044
| * | | | | | | | | VS: improve options generationVitaly Stakhovsky2018-05-052-124/+99
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make use of the `Elem` and `OptionsHelper` classes; some cleanup
* | | | | | | | | | Merge topic 'deprecate_static_managed_targets'Brad King2018-05-084-14/+41
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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: add handling of static C# targetsMichael Stürmer2018-05-071-0/+5
| | | | | | | | | | |
| * | | | | | | | | | cmVisualStudio10TargetGenerator: add handling of manual /clr settingMichael Stürmer2018-05-071-0/+10
| | | | | | | | | | |
| * | | | | | | | | | cmVisualStudio10TargetGenerator: fix checking for managed targetMichael Stürmer2018-05-071-12/+3
| | | | | | | | | | |
| * | | | | | | | | | cmVisualStudio10TargetGenerator: issue warning when adding static C# libMichael Stürmer2018-05-073-0/+19
| | | | | | | | | | |
| * | | | | | | | | | cmGeneratorTarget: make GetManagedType() return 'Native' for static targetsMichael Stürmer2018-05-071-3/+5
| | | | | | | | | | |
* | | | | | | | | | | Merge topic 'update-libuv'Brad King2018-05-0861-752/+991
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0d389d175a libuv: Revert local linux/sparc64 fix now that we have upstream fix 42fbb28516 Merge branch 'upstream-libuv' into update-libuv c8b67ea119 libuv 2018-05-06 (bf605bd7) Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2049
| * | | | | | | | | | | libuv: Revert local linux/sparc64 fix now that we have upstream fixBrad King2018-05-071-1/+1
| | | | | | | | | | | |
| * | | | | | | | | | | Merge branch 'upstream-libuv' into update-libuvBrad King2018-05-0761-751/+990
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream-libuv: libuv 2018-05-06 (bf605bd7)
| | * | | | | | | | | | libuv 2018-05-06 (bf605bd7)libuv upstream2018-05-0761-751/+990
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Code extracted from: https://github.com/libuv/libuv.git at commit bf605bd7d0dd5660663e8e2eb44d63aa3355e268 (v1.x).
* | | | | | | | | | | | Merge topic 'doc-code-block-highlight'Brad King2018-05-081-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8114b00b02 Utilities/Sphinx: Do not highlight unspecified code blocks as python Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2047
| * | | | | | | | | | | | Utilities/Sphinx: Do not highlight unspecified code blocks as pythonBrad King2018-05-041-0/+1
| | | | | | | | | | | | |
* | | | | | | | | | | | | Merge topic 'FindCUDA-revert-sepcomp-cublas'Brad King2018-05-081-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9a66345752 FindCUDA: Fix regression in separable compilation without cublas Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2048
| * | | | | | | | | | | | FindCUDA: Fix regression in separable compilation without cublasBrad King2018-05-071-2/+2
| | |_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert commit v3.11.0-rc1~274^2 (FindCUDA: Add cublas device library to separable compilation, 2017-11-03). It breaks targets that do not link to cublas. Another solution will be needed to solve the original problem in a more compatible way. Fixes: #17965
generated by cgit v0.12 at 2025-01-23 16:35:40 (GMT)