mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-05-04 05:10:10 -05:00
Code Issues Packages Projects Releases Wiki Activity
37,831 Commits 2 Branches 401 Tags
7576e9f8a30bb50a3157fe5e3ec493be8a9299bc
Commit Graph

37831 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brad King 7576e9f8a3 Merge branch 'upstream-KWSys' into update-kwsys 
* upstream-KWSys:
  KWSys 2017-11-01 (6ffca34c)
 2017-11-01 08:38:26 -04:00
KWSys Upstream 7d3f33e612 KWSys 2017-11-01 (6ffca34c) 
Code extracted from:

    https://gitlab.kitware.com/utils/kwsys.git

at commit 6ffca34c008f0aac44db0e0c2826673a0e3f6ecf (master).

Upstream Shortlog
-----------------

Brad King (2):
      7a4cca11 Process: Refactor test compile flag addition
      90886a99 Process: Fix tests under ubsan

Bradley Lowekamp (1):
      b4507c9c Remove dead code from Configure.h.in

Domen Vrankar (1):
      9e0b4d1a SystemTools: set default MakeDirectory permissions mode
 2017-11-01 08:38:25 -04:00
Brad King a57bad6c3d Merge branch 'release-3.10' 2017-11-01 08:07:25 -04:00
Brad King 1c222d8544 Merge branch 'release-3.9' 2017-11-01 08:07:18 -04:00
Brad King c693db0f62 Merge branch 'backport-3.9-autogen-moc-predefs-no-moc-options' into release-3.9 
Merge-request: !1432
 2017-11-01 08:06:42 -04:00
Brad King 77e758a3ed Merge topic 'autogen-moc-predefs-no-moc-options' 
4e46f97c Merge branch 'backport-3.9' into autogen-moc-predefs-no-moc-options
978c98b7 Autogen: Don't add AUTOMOC_MOC_OPTIONS to moc-predefs command
d3caf941 Autogen: Tests: Set AUTOMOC_MOC_OPTIONS in a simple test
96d20a4d Autogen: Don't use AUTOMOC_MOC_OPTIONS in moc-predefs command

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: EoD <eod@xmw.de>
Merge-request: !1432
 2017-11-01 08:05:47 -04:00
Brad King 4e46f97c84 Merge branch 'backport-3.9' into autogen-moc-predefs-no-moc-options 2017-11-01 08:03:55 -04:00
Brad King cdc9c110a5 Merge topic '16780-write-single-xcodeproj' 
e4e9ce7c Xcode: Add option to generate only topmost project file

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1395
 2017-11-01 08:02:15 -04:00
Brad King 4857aec5d5 Merge topic 'notes_timestamp' 
0987a399 CTest: fix Time formatting in Notes.xml

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1428
 2017-11-01 08:01:44 -04:00
Brad King ac1d190291 Merge topic 'windows-embed-cmake-version' 
5b9da05b Windows: Embed version information into CMake binaries

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1412
 2017-11-01 08:00:45 -04:00
Brad King 93cd333103 Merge topic 'mingw-clang-c-compile-features' 
f86879a0 Record C compile features flags for MinGW Clang on Windows

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1435
 2017-11-01 07:40:35 -04:00
Brad King 8d1341f4ff Merge branch 'mingw-clang-c-compile-features' into release-3.10 
Merge-request: !1435
 2017-11-01 07:39:02 -04:00
Brad King f86879a04c Record C compile features flags for MinGW Clang on Windows 
This was done for C++ by commit v3.5.0-rc1~69^2 (Record compile features
for MinGW Clang on Windows, 2016-01-11).  Make the same change for C.
The `UNIX` condition on Clang C compiler features was already dropped by
refactoring in commit v3.9.0-rc1~17^2~4 (Compilers: Port to use default
cmake_record_lang_compile_features macros, 2017-05-10).

Our documentation already claims support for this combination.  This
was simply an oversight when support was added for MinGW Clang C++.

Issue: #15897
Issue: #15943
 2017-11-01 07:28:38 -04:00
Kitware Robot a0d00a1710 CMake Nightly Date Stamp 2017-11-01 00:01:05 -04:00
Gregor Jasny e4e9ce7cbe Xcode: Add option to generate only topmost project file 
Closes #16780
 2017-10-31 17:09:26 +01:00
Sebastian Holtermann 978c98b7bd Autogen: Don't add AUTOMOC_MOC_OPTIONS to moc-predefs command 
Issue: #17418
 2017-10-31 11:46:15 -04:00
Brad King 1df31aa92a Merge branch 'autogen-moc-predefs-no-moc-options' into release-3.10 
Merge-request: !1432
 2017-10-31 10:18:14 -04:00
Justin Goshi 5b9da05b7a Windows: Embed version information into CMake binaries 2017-10-31 10:02:25 -04:00
Zack Galbreath 0987a399ec CTest: fix Time formatting in Notes.xml 
Notes.xml was reporting its timestamp in E-notation.  Here's an example of
what this looked like:
  <Time>1.50938e+09</Time>

This format is unsuitable for precisely determining when the Notes file
was generated.  As a result of this commit, the same field now appears as:
  <Time>1509383044</Time>
 2017-10-31 10:00:38 -04:00
Sebastian Holtermann d3caf941e4 Autogen: Tests: Set AUTOMOC_MOC_OPTIONS in a simple test 2017-10-31 14:55:49 +01:00
Sebastian Holtermann 96d20a4de3 Autogen: Don't use AUTOMOC_MOC_OPTIONS in moc-predefs command 
Closes #17418
 2017-10-31 14:20:24 +01:00
Brad King fccbe2d30b Merge branch 'release-3.10' 2017-10-31 08:55:04 -04:00
Brad King 9ba15bfceb Merge topic 'autogen-change-rcc-config-suffix' 
bda0875a Autogen: Make rcc output file suffix static (instead of pseudo-random)

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Taylor Braun-Jones <taylor@braun-jones.org>
Merge-request: !1425
 2017-10-31 08:54:26 -04:00
Brad King 562bcb84ab Merge topic 'update-vim-syntax' 
8a6cdbae update vim-syntax to latest cmake-commit
11225ec6 vim-cmake-syntax 2017-10-31 (a8a846f0)

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1431
 2017-10-31 08:23:34 -04:00
Brad King 6341596e29 Merge topic 'cmp0037-conditional-targets' 
ae5f4069 CMP0037: Allow test and package targets when features are not enabled
409527a0 CMP0037: De-duplicate check and message generation
a2611d81 Tests: Add RunCMake.CMP0037 case for WARN on reserved targets
103501c4 Tests: Do not enable languages in all cases of RunCMake.CMP0037
2d0b3e6e cmGlobalGenerator: Refactor test and package target conditions

Acked-by: Kitware Robot <kwrobot@kitware.com>
Reviewed-by: Ben Boeckel <ben.boeckel@kitware.com>
Merge-request: !1417
 2017-10-31 08:19:27 -04:00
Brad King 8c6fa52515 Merge topic '15468-xcode-hide-zero-check-source-group' 
89add9b3 Xcode: Do not create ZERO_CHECK source group

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1429
 2017-10-31 08:13:52 -04:00
Brad King 9c2e8cf8a2 Merge topic 'vs-hlsl-opt-dbg' 
025221df VS: Add source file property to set hlsl debug and optimization flags

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1420
 2017-10-31 08:11:49 -04:00
Brad King 31336538b8 Merge topic 'minifixes' 
6a4a61d9 cmForEachCommand: prevent leakage
52680d80 cm_codecvt: cleanup superfluous semicolons

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1402
 2017-10-31 08:11:13 -04:00
Patrick Boettcher 8a6cdbae16 update vim-syntax to latest cmake-commit 2017-10-31 07:44:53 +01:00
vim-cmake-syntax upstream 11225ec6de vim-cmake-syntax 2017-10-31 (a8a846f0) 
Code extracted from:

    https://github.com/pboettch/vim-cmake-syntax.git

at commit a8a846f067e8d8bf565c27a1943017f9fce5a5b7 (master).

Upstream Shortlog
-----------------

Dimitri Merejkowsky (4):
      4e3a59ce Small cleanups asked by Bram
      ecff9926 Add Dimitri as maintainer for the indent file too
      c6a2f171 indent/cmake.vim: save and restore cpo option
      f2a8a21b cmake indent: replace &sw by shiftwidth()

Patrick Boettcher (2):
      9e9ad02e do not force expandtabs for all cmake-users
      a8a846f0 update keywords to 3.10.20171031-gfd2e6
 2017-10-31 07:43:30 +01:00
Kitware Robot fd2e6212a6 CMake Nightly Date Stamp 2017-10-31 00:01:05 -04:00
Brad King f49b6871e9 Merge branch 'autogen-change-rcc-config-suffix' into release-3.10 
Merge-request: !1425
 2017-10-30 13:58:55 -04:00
Gregor Jasny 89add9b3e6 Xcode: Do not create ZERO_CHECK source group 
Closes #15468
 2017-10-30 18:39:40 +01:00
Sebastian Holtermann bda0875ac3 Autogen: Make rcc output file suffix static (instead of pseudo-random) 2017-10-30 16:30:46 +01:00
Brad King ae5f40696e CMP0037: Allow test and package targets when features are not enabled 
When CMake will not generate a test, package, or package_source target,
allow projects to create their own targets with these names.

Fixes: #16062
 2017-10-30 10:21:31 -04:00
Brad King 409527a03c CMP0037: De-duplicate check and message generation 2017-10-30 10:21:21 -04:00
Matthias Maennich 6a4a61d9e1 cmForEachCommand: prevent leakage 2017-10-30 09:55:02 -04:00
Matthias Maennich 52680d8092 cm_codecvt: cleanup superfluous semicolons 2017-10-30 09:54:44 -04:00
Jeremiah van Oosten 025221df2a VS: Add source file property to set hlsl debug and optimization flags 
Add `VS_SHADER_DISABLE_OPTIMIZATIONS` and `VS_SHADER_ENABLE_DEBUG`
source file properties to control these settings on `.hlsl` files in the
VS generator.

Fixes: #17406
 2017-10-30 09:52:10 -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