mirrors/cmake
2
0 Fork 0
mirror of https://gitlab.kitware.com/cmake/cmake.git synced 2026-10-06 04:03:27 +03:00
Code Activity
47,352 Commits 2 Branches 415 Tags
94de927cab19609aeeff032c64f16cfd257fca2f
Commit Graph
28539 Commits
Author SHA1 Message Date
Brad King 42461a2a01 Merge topic 'cpack-dmg-errors' 
1943dc6b cmCPackDragNDropGenerator: Improve error reporting

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1379
 2017-10-16 09:47:34 -04:00
Brad King 9c3bdbd584 Merge topic 'update-kwsys' 
df92617b Merge branch 'upstream-KWSys' into update-kwsys
e44b0cb2 KWSys 2017-10-12 (ef0ad34d)

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1384
 2017-10-16 09:46:23 -04:00
Kitware Robot 386f7c6e98 CMake Nightly Date Stamp 2017-10-16 00:01:05 -04:00
Kitware Robot 7b26768dfa CMake Nightly Date Stamp 2017-10-15 00:01:03 -04:00
Kitware Robot 9628f0c001 CMake Nightly Date Stamp 2017-10-14 00:01:05 -04:00
Gregor Jasny 96d642c7b8 cmake-gui: Use cmake::Open to open generated project 2017-10-13 21:28:35 +02:00
Gregor Jasny 5de37a4a64 cmake: Add --open option for IDE generators 2017-10-13 21:28:34 +02:00
Brad King f64c554cc9 Merge branch 'imported-interface-no-system' into release-3.10 
Merge-request: !1386
 2017-10-13 14:36:45 -04:00
Brad King 2de0e0fdfa Do not initialize NO_SYSTEM_FROM_IMPORTED on INTERFACE libraries 
The change in commit v3.8.0-rc1~276^2 (Allow NO_SYSTEM_FROM_IMPORTED on
imported INTERFACE libraries, 2016-11-21) was incorrect.  The property
is not meant to be set on imported targets at all.  It is meant to be
set on their consumers that compile sources.  Since INTERFACE libraries
have no sources to compile, the property is not needed on them.

Revert most of that change.  Unfortunately we must still tolerate
project code setting NO_SYSTEM_FROM_IMPORTED on INTERFACE libraries
because they were allowed by CMake 3.8 and 3.9.

Issue: #17348
 2017-10-13 14:32:14 -04:00
Stephen Sorley e1409101c9 cpack wix: support WiX generator on Cygwin 
Cygwin-built CMake now converts paths from Cygwin to Windows form
(using cygpath -w) before they're passed to WiX.

The Wix generator on Cygwin requires the libuuid-dev package when
building CMake. However, the DLL it links to is installed by default
as part of Cygwin's core libs, so it does not need to be distributed.

If libuuid-dev isn't available, CMake is simply built without Wix
support on Cygwin.
 2017-10-13 13:07:37 -04:00
Brad King df92617b73 Merge branch 'upstream-KWSys' into update-kwsys 
* upstream-KWSys:
  KWSys 2017-10-12 (ef0ad34d)
 2017-10-13 09:14:04 -04:00
Kitware Robot 18eec11539 CMake Nightly Date Stamp 2017-10-13 00:01:06 -04:00
Brad King 4d04ede10c CMake 3.10.0-rc2 2017-10-12 09:25:33 -04:00
Kitware Robot add1ba92f7 CMake Nightly Date Stamp 2017-10-12 00:01:05 -04:00
Clinton Stimpson 1943dc6bd5 cmCPackDragNDropGenerator: Improve error reporting 
When running hdiutil and other commands, capture errors and log them.
 2017-10-11 20:40:59 -06:00
Brad King 5fd0ce61f7 Merge topic 'linked-tree' 
ff09abb8 cmLinkedTree: avoid unnecessary copies during Push of T

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1351
 2017-10-11 08:24:23 -04:00
Brad King 86edb6660b Merge topic 'simplify-env-var-determination' 
5731f6d5 cm{Unset,Set}Command: use std::string to determine the env variable name

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1350
 2017-10-11 08:22:58 -04:00
Brad King 5d6ba8f2da Merge topic 'autogen-skip-ui' 
e95429fd Autogen: Docs: Extend SKIP_AUTOUIC documentation
814cddbe Autogen: Docs: Add examples for AUTORCC_OPTIONS and AUTOUIC_OPTIONS
1c196268 Autogen: Allow setting SKIP_AUTOUIC/GEN on .ui files not in the sources

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1366
 2017-10-11 08:17:57 -04:00
Brad King 401737f9ff Merge topic 'update-kwsys' 
f1a4ecdc Merge branch 'upstream-KWSys' into update-kwsys
c551ff58 KWSys 2017-10-10 (239bc737)

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1370
 2017-10-11 08:15:24 -04:00
Kitware Robot 6e1fd9269c CMake Nightly Date Stamp 2017-10-11 00:01:06 -04:00
Matthias Maennich 5731f6d5b1 cm{Unset,Set}Command: use std::string to determine the env variable name 2017-10-10 13:28:39 -04:00
Brad King 8af7a16be7 Merge topic 'tryrun-strcpy' 
a483b7ea TryRun: do not call strcpy()

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1364
 2017-10-10 09:10:54 -04:00
Brad King f1a4ecdc0c Merge branch 'upstream-KWSys' into update-kwsys 
* upstream-KWSys:
  KWSys 2017-10-10 (239bc737)
 2017-10-10 08:43:41 -04:00
Kitware Robot c798dc8573 CMake Nightly Date Stamp 2017-10-10 00:01:03 -04:00
Sebastian Holtermann 1c19626864 Autogen: Allow setting SKIP_AUTOUIC/GEN on .ui files not in the sources 
SKIP_AUTOUIC and SKIP_AUTOGEN were ignored when set on a `.ui` file that
was not in the sources of the target.
 2017-10-09 14:35:17 +02:00
Matthias Maennich ff09abb8db cmLinkedTree: avoid unnecessary copies during Push of T 2017-10-09 10:23:14 +02:00
Kitware Robot cb8f26f199 CMake Nightly Date Stamp 2017-10-09 00:01:03 -04:00
Rolf Eike Beer a483b7eac2 TryRun: do not call strcpy() 2017-10-08 18:36:09 +02:00
Kitware Robot 4e96dc02c3 CMake Nightly Date Stamp 2017-10-08 00:01:03 -04:00
Kitware Robot 720c217ed5 CMake Nightly Date Stamp 2017-10-07 00:01:04 -04:00
Brad King 09a3a1cb9f Merge branch 'minor-fixes' into release-3.10 
Merge-request: !1349
 2017-10-06 07:18:01 -04:00
Brad King 7986103940 Merge topic 'minor-fixes' 
b32b717b cmInstallCommandArguments: do not access static members through `this`
7eaa964e cmProcessTools: fix minor issue introduced by 595feb3
85a7eaba cmGeneratorTarget: remove dead code
3345e2a2 cmcmd: let operator<< for NumberFormatter reset the stream's format flags

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1349
 2017-10-06 07:17:09 -04:00
Kitware Robot e1d6ede019 CMake Nightly Date Stamp 2017-10-06 00:01:04 -04:00
Brad King 4a4d62430b Merge topic 'cpack-dmg-explicit-hfs' 
4f2a983c CPack: Fix PackageMaker .dmg HFS+ creation on macOS APFS hosts

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1354
 2017-10-05 10:49:58 -04:00
Brad King ecaddda2fe Merge branch 'cpack-dmg-explicit-hfs' into release-3.10 
Merge-request: !1354
 2017-10-05 10:40:37 -04:00
Brad King 4f2a983c21 CPack: Fix PackageMaker .dmg HFS+ creation on macOS APFS hosts 
When running `hdiutil create`, specify the HFS+ filesystem explicitly.
Otherwise `hdiutil` may choose a filesystem based on the host.  We do
not want to create APFS images for `.dmg` packages because they may not
mount on macOS versions prior to 10.12.

This was missed in commit 39b50975d9 (CPack: Fix .dmg HFS+ creation on
macOS APFS hosts, 2017-10-02).

Reported-by: Alan Garny
 2017-10-05 10:33:13 -04:00
Brad King ba8aa6899d Begin post-3.10 development 2017-10-05 09:59:57 -04:00
Brad King 05373ee1a2 CMake 3.10.0-rc1 version update 2017-10-05 09:55:23 -04:00
Matthias Maennich b32b717b69 cmInstallCommandArguments: do not access static members through this 2017-10-05 14:53:52 +02:00
Matthias Maennich 7eaa964e9b cmProcessTools: fix minor issue introduced by 595feb3 2017-10-05 14:53:52 +02:00
Matthias Maennich 85a7eaba5e cmGeneratorTarget: remove dead code 
explicitLibraries can never be nullptr at this point
 2017-10-05 14:53:51 +02:00
Matthias Maennich 3345e2a2cc cmcmd: let operator<< for NumberFormatter reset the stream's format flags 2017-10-05 14:50:25 +02:00
Kitware Robot 78d4a3db03 CMake Nightly Date Stamp 2017-10-05 00:01:04 -04:00
Brad King 44d0e377f9 Merge topic 'vs-no-empty-link-version' 
0b419b99 VS: Do not emit empty linker Version tag

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1332
 2017-10-04 07:07:50 -04:00
Brad King 8b5539d1c2 Merge topic 'src-flags-genex-target' 
303cd703 VS,Xcode: Fix TARGET_PROPERTY genex in source COMPILE_FLAGS property

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Nikita Nemkin <nikita@nemkin.ru>
Merge-request: !1336
 2017-10-04 07:05:41 -04:00
Kitware Robot 19fce04713 CMake Nightly Date Stamp 2017-10-04 00:01:07 -04:00
Vitaly Stakhovsky 0b419b998d VS: Do not emit empty linker Version tag 
This empty element does nothing, so simply remove it to simplify
generated `.vcxproj` files.
 2017-10-03 08:27:46 -04:00
Brad King 303cd7037a VS,Xcode: Fix TARGET_PROPERTY genex in source COMPILE_FLAGS property 
This already worked in other generators.  Also add a test case.

Fixes: #17314
 2017-10-03 08:03:33 -04:00
Kitware Robot 6b2aad04e8 CMake Nightly Date Stamp 2017-10-03 00:01:03 -04:00
Brad King db730f3e50 Merge topic 'file-path-checksum-cpp11' 
23ad08dd Migrate cmFilePathChecksum to C++11

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1334
 2017-10-02 10:37:42 -04:00