mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-02-08 16:19:36 -06:00
Code Issues Packages Projects Releases Wiki Activity
38,978 Commits 2 Branches 390 Tags
fac050ec8d10f7ad8488ff214f8a556a307c46af
Commit Graph

38978 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brad King
fac050ec8d Merge topic 'update-dllplatform' 
2dc2a3eb15 Identify DLL platforms via CMAKE_IMPORT_LIBRARY_SUFFIX

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1832
 2018-03-12 13:40:44 -04:00
Brad King
725b0cab86 Merge topic 'cmake-rc-version-decimal' 
588a1afe76 CMakeVersion.rc: Avoid leading zeros in integer version components

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1835
 2018-03-12 13:39:45 -04:00
Kitware Robot
b340cacde8 CMake Nightly Date Stamp 2018-03-12 00:01:06 -04:00
Kitware Robot
c703972694 CMake Nightly Date Stamp 2018-03-11 00:01:06 -05:00
Kitware Robot
6dbdfab1a9 CMake Nightly Date Stamp 2018-03-10 00:01:12 -05:00
Brad King
588a1afe76 CMakeVersion.rc: Avoid leading zeros in integer version components 
The split in commit v3.11.0-rc1~232^2 (CMakeVersion RC file: Split patch
into 2 components, 2017-12-01) can leave components "2018,0309", but the
latter is an octal constant with digit "9" out of range.  Strip the
leading zero to express the components as "2018,309" so the resource
compiler treats them as decimal.
 2018-03-09 10:52:49 -05:00
Brad King
8c96f6ebbd Merge branch 'release-3.11' 2018-03-09 10:26:40 -05:00
Brad King
c5541cf0da CMake 3.11.0-rc3 v3.11.0-rc3 2018-03-09 08:33:11 -05:00
Stephan Szabo
2dc2a3eb15 Identify DLL platforms via CMAKE_IMPORT_LIBRARY_SUFFIX 
Use `CMAKE_IMPORT_LIBRARY_SUFFIX` to identify platforms that have DLL
import libraries rather than memorizing a list of platform names.

Fixes: #16801
 2018-03-09 08:09:21 -05:00
Brad King
6422a0209c Merge branch 'release-3.10' 2018-03-09 07:45:30 -05:00
Brad King
6e56f28808 Merge topic 'libxml2-target' 
9ef3abd3f3 FindLibXml2: provide imported target LibXml2::LibXml2

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1823
 2018-03-09 07:44:30 -05:00
Brad King
e11410bb0c Merge topic 'cmWorkingDirectory_success_checking' 
5901699672 cmDepends: Remove attempt to change directory that always fails
e60e4dfc88 cmWorkingDirectory: Check success of current dir changes
e654622aee Tests: Add --build-and-test test case
a865f0beb2 Tests: Confirm test working dir set successfully

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1817
 2018-03-09 07:43:54 -05:00
Brad King
44fc572963 Merge topic 'cmoutpconv-static' 
ff5823f512 cmOutputConverter: mark helper functions static

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1827
 2018-03-09 07:40:28 -05:00
Brad King
897bd57025 Merge topic 'GenerateExportHeader-C' 
de348a9638 GenerateExportHeader: Add support for C projects

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1799
 2018-03-09 07:39:43 -05:00
Brad King
98622e5e72 Merge topic 'make-clean-no-targets' 
81bc7610ab Makefile: Fix "make clean" when there are no targets

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1833
 2018-03-09 07:38:49 -05:00
Brad King
f8adde152f Merge topic 'sort_glob_output' 
87a6816baf Add test for sorting and deduping of file(GLOB) result
b688d4fd22 file(GLOB): Ensure entire file list is sorted

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1821
 2018-03-09 07:38:07 -05:00
Brad King
760c6c08a5 Merge branch 'autogen-empty-source-file-fix' into release-3.10 
There is no corresponding merge request because this fix was
cherry-picked specifically for CMake 3.10.
 2018-03-09 06:59:19 -05:00
Sebastian Holtermann
6f2f9ce331 Autogen: Fix for the empty source file crash in 3.10.2 
Issue: #17793
 2018-03-09 06:51:14 -05:00
Kitware Robot
72abc75519 CMake Nightly Date Stamp 2018-03-09 00:01:10 -05:00
Craig Scott
81b17f4649 Merge topic 'project-warn-missing-metadata-values' 
587bad7ba2 project: warn on metadata arguments missing values

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1815
 2018-03-08 16:11:52 -05:00
Rolf Eike Beer
9ef3abd3f3 FindLibXml2: provide imported target LibXml2::LibXml2 2018-03-08 18:31:12 +01:00
Arnaud Gelas
de348a9638 GenerateExportHeader: Add support for C projects 
Previously only C++ projects were supported.

Fixes: #16967
 2018-03-08 10:05:14 -05:00
Brad King
156a959410 Merge topic 'FindGDAL-absolute-path' 
694fce19b6 FindGDAL: Handle gdal-config printing absolute path to library

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1808
 2018-03-08 09:58:56 -05:00
Brad King
50b2d0c944 Merge topic 'misc-typos' 
32f6b7a43b Fix misc typos in documentation and comments

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1826
 2018-03-08 09:58:19 -05:00
Brad King
1076ac9d68 Merge topic 'vs10-xmlmacros' 
59d8cfb85e cmVisualStudio10TargetGenerator: Use helpers for XML tags

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1813
 2018-03-08 09:57:44 -05:00
Brad King
151763c9b2 Merge topic 'curl-target' 
ee06f3c339 FindCURL: Revise documentation markup
83c0cb3f03 FindCURL: provide imported target CURL::CURL

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1822
 2018-03-08 09:56:40 -05:00
Brad King
f0b412dd82 Merge topic 'avoid-LIB_DEPENDS' 
7723e9a058 Do not produce legacy _LIB_DEPENDS cache entries
2124a1364a cmTarget: Remove unnecessary RecordDependencies member
1c5bfab532 cmTarget: Simplify ClearDependencyInformation implementation
910a9d608e cmTarget: Simplify ClearDependencyInformation signature

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Pavel Solodovnikov <hellyeahdominate@gmail.com>
Merge-request: !1828
 2018-03-08 09:55:09 -05:00
Brad King
4f99809b71 Merge branch 'release-3.11' 2018-03-08 09:51:39 -05:00
Brad King
ca2ac4979d Merge topic 'update-kwsys' 
2c5b4359f8 Merge branch 'upstream-KWSys' into update-kwsys
64d4308d83 KWSys 2018-03-07 (2ad561e7)

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1830
 2018-03-08 09:50:19 -05:00
Brad King
69b152967d Merge topic 'cuda-no-device-link-rsp' 
f64732f59b CUDA: Do not pass unsupported @rspfile arguments to NVCC

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1831
 2018-03-08 09:48:28 -05:00
Brad King
81bc7610ab Makefile: Fix "make clean" when there are no targets 
The empty `clean` target was missing from `Makefile2`.
Add one like we already have for `all` and `preinstall`.
 2018-03-08 09:01:53 -05:00
Craig Scott
5901699672 cmDepends: Remove attempt to change directory that always fails 
Nothing ever set `CompileDirectory` except `SetDirectory()`, but
nothing ever called that function. Therefore, `CompileDirectory`
was always empty for the attempt to change directory in `Check()`,
which therefore would always fail. Nothing was checking the result
and the code was always going to have no effect.
 2018-03-08 20:14:42 +11:00
Craig Scott
e60e4dfc88 cmWorkingDirectory: Check success of current dir changes 2018-03-08 20:07:14 +11:00
Kitware Robot
458fc1de49 CMake Nightly Date Stamp 2018-03-08 00:01:12 -05:00
Shane Parris
87a6816baf Add test for sorting and deduping of file(GLOB) result 2018-03-07 12:12:19 -05:00
Shane Parris
b688d4fd22 file(GLOB): Ensure entire file list is sorted 2018-03-07 12:12:19 -05:00
luz.paz
32f6b7a43b Fix misc typos in documentation and comments 2018-03-07 10:54:46 -05:00
Brad King
57f35bba84 Merge branch 'cuda-no-device-link-rsp' into release-3.11 
Merge-request: !1831
 2018-03-07 10:52:54 -05:00
Brad King
f64732f59b CUDA: Do not pass unsupported @rspfile arguments to NVCC 
The nvcc compiler does not support `@<rspfile>` arguments.  It does
offer a `--options-file` argument that can be investigated later.

Fixes: #17797
 2018-03-07 10:30:35 -05:00
Alex Turbov
587bad7ba2 project: warn on metadata arguments missing values 
Warn if `DESCRIPTION` or `VERSION` is given without a following value.
 2018-03-07 09:35:59 -05:00
Adam Thompson
694fce19b6 FindGDAL: Handle gdal-config printing absolute path to library 
FindGDAL uses GDAL's 'gdal-config' utility to obtain the path to GDAL's library
(on systems identified by CMake's UNIX variable). Older versions formatted this
information like that of dependent libraries:
  -L/path/to/gdal/lib -lgdal[suffix]

Newer versions instead provide the full path to the library:
  /path/to/gdal/lib/[prefix]gdal[suffix]

FindGDAL now supports both formats. Entries that don't start with '-L' or '-l'
are only considered if they are absolute paths that exist on disk.
Furthermore, libraries are only considered if the name contains 'gdal'
(checked case-insensitively).
 2018-03-07 09:29:57 -05:00
Brad King
ee06f3c339 FindCURL: Revise documentation markup 2018-03-07 09:06:01 -05:00
Vitaly Stakhovsky
59d8cfb85e cmVisualStudio10TargetGenerator: Use helpers for XML tags 
Make the XML generating code smaller, more structured, and less
error-prone.  This is a step towards future XML refactoring.
 2018-03-07 08:51:30 -05:00
Brad King
9ceafdfd4d Merge topic 'FindOpenMP-AppleClang' 
e3cd7c1e01 FindOpenMP: Add support for AppleClang compiler
b4c539e651 FindOpenMP: Verify in test source that OMP library is linked
7dd8c7a680 FindOpenMP: Improve inclusion of helper modules

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1812
 2018-03-07 08:33:33 -05:00
Henry Fredrick Schreiner
e3cd7c1e01 FindOpenMP: Add support for AppleClang compiler 
This is possible using an external `omp` library and by passing
the flag past the compiler driver via `-Xclang -fopenmp`.

Fixes: #17775
 2018-03-07 08:27:35 -05:00
Henry Fredrick Schreiner
b4c539e651 FindOpenMP: Verify in test source that OMP library is linked 2018-03-07 08:25:45 -05:00
Henry Fredrick Schreiner
7dd8c7a680 FindOpenMP: Improve inclusion of helper modules 
Use `CMAKE_CURRENT_LIST_DIR` instead of `CMAKE_ROOT`.
Do not include modules inside a loop.
 2018-03-07 08:24:27 -05:00
Brad King
7723e9a058 Do not produce legacy _LIB_DEPENDS cache entries 
Introduce policy `CMP0073` to avoid producing these cache entries.

Fixes: #16364
 2018-03-07 07:48:40 -05:00
Brad King
9288abf567 Merge branch 'update-kwsys' into release-3.11 
Merge-request: !1830
 2018-03-07 07:39:16 -05:00
Brad King
29b41babdb Merge topic 'ctest-affinity' 
6be53c6695 CTest: Add options to control test process affinity to CPUs
c5428d8db2 libuv: disable process affinity during CMake bootstrap
24de561a1a libuv: unix,win: add uv_spawn option to set child CPU affinity mask
43d6e5a71f libuv: misc: add function to get CPU affinity mask size

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1814
 2018-03-07 07:14:35 -05:00