mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-02-26 10:48:38 -06:00
Code Issues Packages Projects Releases Wiki Activity
37,790 Commits 2 Branches 391 Tags
fd2e6212a66cd443bbf3e5b6e2cfd77ef1fb7b61
Commit Graph

37790 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Kitware Robot
fd2e6212a6 CMake Nightly Date Stamp 2017-10-31 00:01:05 -04:00
Brad King
41d796be15 Merge topic 'vs-diagnostics-flag' 
82f95c95 VS generator: support /diagnostics compiler flag

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1411
 2017-10-30 09:04:37 -04:00
Brad King
2ad3576594 Merge branch 'release-3.10' 2017-10-30 09:02:59 -04:00
Brad King
ccf1155977 Merge topic 'freetype-windows' 
3d42c3ed FindFreetype: Normalize slashes when legacy FREETYPE_LIBRARY is specified

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1416
 2017-10-30 08:59:00 -04:00
Brad King
9bfc43a5e5 Merge topic 'autogen-qrc-file-name' 
a8bf0b2b Autogen: RCC: Append checksum suffix to wrapped file name

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1422
 2017-10-30 08:58:26 -04:00
Brad King
469ac58925 Merge branch 'autogen-qrc-file-name' into release-3.10 
Merge-request: !1422
 2017-10-30 08:57:38 -04:00
Brad King
58e0692b62 Merge topic 'cpack-deb-0-so-version-support' 
5784ab8f CPack/Deb: handle shlibs file generation when SOVERSION set to 0

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1423
 2017-10-30 08:55:36 -04:00
Brad King
e48397ee29 Merge topic 'cpack-rpm-dist-test-fix' 
9ce00cae CPack/RPM: DIST-MONOLITHIC-type subtest fix

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1424
 2017-10-30 08:52:48 -04:00
Brad King
da00080ed4 Merge branch 'cpack-rpm-dist-test-fix' into release-3.10 
Merge-request: !1424
 2017-10-30 08:50:21 -04:00
Domen Vrankar
9ce00caee3 CPack/RPM: DIST-MONOLITHIC-type subtest fix 
Test was failing in case dist macro contained
a + symbol which is valid but must be escaped
for using the string as a regex.

Fixes #17328
 2017-10-30 08:48:46 -04:00
Brad King
a7b770686a Merge topic 'fix-co-compile' 
197b4e18 Merge branch 'backport-fix-co-compile' into fix-co-compile
992962c7 cmcmd: Restore support for running multiple lint tools
a5197eea cmcmd: Convert lint handlers to file-static functions
1c075ffd cmcmd: Rename loop iteration variable for clarity

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1418
 2017-10-30 08:46:59 -04:00
Brad King
9bec6afa7a Merge topic 'autogen-static-library-cycles' 
3a4db861 Autogen: Tests: Add test for STATIC_LIBRARY cycles
798e4f2f Autogen: Don't add STATIC_LIBRARY cycle targets to the _autogen dependencies

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1408
 2017-10-30 08:45:49 -04:00
Kitware Robot
20f462dffc CMake Nightly Date Stamp 2017-10-30 00:01:03 -04:00
Kitware Robot
4d7fedf8a2 CMake Nightly Date Stamp 2017-10-29 00:01:04 -04:00
Sebastian Holtermann
a8bf0b2b37 Autogen: RCC: Append checksum suffix to wrapped file name 
Closes #17404
 2017-10-29 03:28:20 +01:00
Domen Vrankar
5784ab8fca CPack/Deb: handle shlibs file generation when SOVERSION set to 0 
Setting CPACK_DEBIAN_PACKAGE_GENERATE_SHLIBS did not
auto generate shlibs control file when .so version
of the library was set to 0.

Fixes #17318
 2017-10-29 00:20:54 +02:00
Kitware Robot
ced94bcbd9 CMake Nightly Date Stamp 2017-10-28 00:01:04 -04:00
Mark Salisbury
3d42c3eda2 FindFreetype: Normalize slashes when legacy FREETYPE_LIBRARY is specified 
On Windows if you specify the library path using a regular Windows
path with backslashes, FindFreetype announces that it found the library,
but the value is reported with backslashes instead of forward slashes.
This breaks assumptions elsewhere in CMake.  Convert slashes explicitly
since we have no `find_library` call for `FREETYPE_LIBRARY`.
 2017-10-27 10:52:14 -04:00
Brad King
8ffc1c3d89 Merge topic 'generalize-importedtargets-behavior' 
fb88d2b5 Help: Add notes for topic 'generalize-importedtargets-behavior'
494906a8 Add support for IMPORTED GLOBAL targets to be aliased
fe4b25ec Teach target_* commands to set INTERFACE properties of IMPORTED targets
e40fd9fd cmTargetPropCommandBase: Fix typo in error message

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Henry Schreiner <henryschreineriii@gmail.com>
Merge-request: !1264
 2017-10-27 09:47:31 -04:00
Brad King
dfaf84ca73 Merge topic 'findICU_update' 
20696a53 FindICU: Add support for static libraries on Windows
606ece67 FindICU: Search in 'sbin' directories for icu tools

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1396
 2017-10-27 09:44:34 -04:00
Brad King
dcca130bb0 Merge topic 'cmdparser-strcpy' 
576c079f cmCommandArgumentParser: remove the variable tokens from the class
98cb9f3e cmCommandArgumentParserHelper: constify some char* values

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1410
 2017-10-27 09:43:09 -04:00
Brad King
b779b8e85f Merge topic 'cmp0040-wording' 
a1b1f1a2 CMP0040: Clarify policy warning to match documentation

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1415
 2017-10-27 09:42:37 -04:00
Brad King
0504fc8d84 Merge branch 'backport-fix-co-compile' into release-3.10 
Merge-request: !1418
 2017-10-27 09:41:25 -04:00
Brad King
dc4d2021e1 Merge branch 'autogen-static-library-cycles' into release-3.10 
Merge-request: !1408
 2017-10-27 09:41:11 -04:00
Sebastian Holtermann
3a4db8617e Autogen: Tests: Add test for STATIC_LIBRARY cycles 2017-10-27 09:37:15 -04:00
Sebastian Holtermann
798e4f2fad Autogen: Don't add STATIC_LIBRARY cycle targets to the _autogen dependencies 
When a STATIC_LIBRARY cycle is detected we don't add any STATIC_LIBRARY target
from the cycle to the `_autogen` target dependencies.

Closes #17389
 2017-10-27 09:37:15 -04:00
Brad King
197b4e18d4 Merge branch 'backport-fix-co-compile' into fix-co-compile 
Resolve a logical conflict by replacing `cmArray{Begin,End}` from
the their side with `cm::{cbegin,cend}` from our side.
 2017-10-27 09:31:04 -04:00
Brad King
992962c76d cmcmd: Restore support for running multiple lint tools 
Refactoring in commit v3.10.0-rc1~115^2 (Clean up iwyu code to not be
one big if statement, 2017-08-28) incorrectly changed the logic to run
only one lint tool at a time.  Restore support for running all tools
specified on the command-line.
 2017-10-27 09:26:50 -04:00
Brad King
a5197eeac7 cmcmd: Convert lint handlers to file-static functions 
These do not need to be declared in the header.
 2017-10-27 08:36:28 -04:00
Brad King
1c075ffd60 cmcmd: Rename loop iteration variable for clarity 2017-10-27 08:36:28 -04:00
Kitware Robot
971b8c3c80 CMake Nightly Date Stamp 2017-10-27 00:01:10 -04:00
Brad King
f01576012f Merge branch 'cmp0040-wording' into release-3.10 
Merge-request: !1415
 2017-10-26 09:48:28 -04:00
Brad King
a1b1f1a282 CMP0040: Clarify policy warning to match documentation 
In commit v3.5.0-rc1~8^2~2 (Help: Clarify policy `CMP0040`
documentation, 2016-01-28) the documentation was clarified to indicate
that the target must be defined in the current directory.  Do the same
for the text of the policy warning itself.

Fixes: #17399
 2017-10-26 09:47:29 -04:00
Brad King
8b10098598 Merge branch 'release-3.10' 2017-10-26 09:37:01 -04:00
Brad King
fb88d2b5be Help: Add notes for topic 'generalize-importedtargets-behavior' 
Inspired-by: Deniz Bahadir <dbahadir@benocs.com>
 2017-10-26 09:11:05 -04:00
Deniz Bahadir
494906a8a2 Add support for IMPORTED GLOBAL targets to be aliased 
Issue: #15569
Issue: #17197
 2017-10-26 09:11:04 -04:00
Deniz Bahadir
fe4b25ec2f Teach target_* commands to set INTERFACE properties of IMPORTED targets 
Now, several `INTERFACE_*` properties can be set on `IMPORTED` targets,
not only via `set_property` and `set_target_properties` but also via
`target_compile_definitions`, `target_compile_features`,
`target_compile_options`, `target_include_directories`, `target_sources`
and `target_link_libraries`.

Fixes: #15689
Issue: #17197
 2017-10-26 09:11:04 -04:00
Deniz Bahadir
e40fd9fd19 cmTargetPropCommandBase: Fix typo in error message 2017-10-26 09:11:00 -04:00
Brad King
6a8c765c8f Merge topic 'cm-array-begins-size' 
57132765 Replace cmArray{Begin,End,Size} by their standard counterparts

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1352
 2017-10-26 08:57:04 -04:00
Brad King
0278ec84d8 Merge topic 'clang-cl-TP' 
7077a554 Clang: Use -TP flag for C++ sources with clang-cl

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1407
 2017-10-26 08:56:37 -04:00
Kitware Robot
6b829ff23d CMake Nightly Date Stamp 2017-10-26 00:02:39 -04:00
Francois Budin
20696a53e4 FindICU: Add support for static libraries on Windows 
When compiling ICU statically on Windows with Visual Studio, the library
file names are prefixed with 's' [1].

[1] http://source.icu-project.org/repos/icu/trunk/icu4c/source/icudefs.mk.in
    `STATIC_PREFIX_WHEN_USED = s`
 2017-10-25 16:21:48 -04:00
Francois Budin
606ece67ef FindICU: Search in 'sbin' directories for icu tools 
On Ubuntu, several binaries that FindICU.cmake searches for are installed
in 'sbin' instead of 'bin' [1].

[1] https://packages.ubuntu.com/xenial/amd64/icu-devtools/filelist
 2017-10-25 16:20:19 -04:00
Justin Goshi
82f95c9584 VS generator: support /diagnostics compiler flag 
Adding support for this flag so a user can specify it
via the CMAKE_CXX_FLAGS variable.
 2017-10-25 12:09:48 -07:00
Rolf Eike Beer
576c079faa cmCommandArgumentParser: remove the variable tokens from the class 
Make them local constants in the lexer file.
 2017-10-25 19:56:33 +02:00
Rolf Eike Beer
98cb9f3ee9 cmCommandArgumentParserHelper: constify some char* values 2017-10-25 19:56:33 +02:00
Brad King
206354ac4c Merge branch 'release-3.10' 2017-10-25 08:44:18 -04:00
Brad King
cec4b86f0a Merge topic 'server-codemodel-install-dest' 
296eb9ad cmake-server: Add target install destinations to codemodel

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1382
 2017-10-25 08:17:03 -04:00
Brad King
7470561278 Merge topic 'flang-windows' 
b2c6c357 Flang: Add partial support on Windows

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1404
 2017-10-25 08:15:43 -04:00
Brad King
e419a67a56 Merge topic 'windows_symlinks' 
393e0fbe cmTimestamp: For symlinks switch to timestamp of resolved path
640709e7 cmSystemTools: Implement GetRealPath on Windows
d41582fc Call GetRealPath through cmSystemTools instead of KWSys directly

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1202
 2017-10-25 08:14:55 -04:00