summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
| |/ / / / / / /
* | | | | | | | 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
generated by cgit v0.12 at 2025-01-27 02:39:01 (GMT)