mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-01-16 11:40:25 -06:00
Code Issues Packages Projects Releases Wiki Activity
37,607 Commits 2 Branches 385 Tags
5d6ba8f2daab9ebff570f36908d48defdf37d607
Commit Graph

23570 Commits

Author SHA1 Message Date
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
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
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
Brad King
39b50975d9 CPack: Fix .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.
 2017-10-02 10:09:37 -04:00
Brad King
a9870c9211 Merge topic 'DNDGen-stack-var' 
ec30129b CPack: put local variable on the stack

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1331
 2017-10-02 08:01:48 -04:00
Brad King
275b4a53ee Merge topic 'autogen-predefs' 
6bbc1e77 Autogen: Add release notes for (CMAKE_)AUTOMOC_COMPILER_PREDEFINES
75c98b5e Autogen: Doc: Add documentation for (CMAKE_)AUTOMOC_COMPILER_PREDEFINES
1d7f099d Autogen: Add (CMAKE_)AUTOMOC_COMPILER_PREDEFINES

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1328
 2017-10-02 08:01:21 -04:00
Brad King
90bd92ae88 Merge topic 'update-kwsys' 
90f1b9ad Merge branch 'upstream-KWSys' into update-kwsys
4532b035 KWSys 2017-09-30 (f108739d)

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1333
 2017-10-02 07:57:48 -04:00
Kitware Robot
41bf791a68 CMake Nightly Date Stamp 2017-10-02 00:01:03 -04:00
Sebastian Holtermann
23ad08dd6c Migrate cmFilePathChecksum to C++11 2017-10-01 12:03:36 +02:00
Kitware Robot
dea0379a69 CMake Nightly Date Stamp 2017-10-01 00:01:02 -04:00
Brad King
90f1b9ad4e Merge branch 'upstream-KWSys' into update-kwsys 
* upstream-KWSys:
  KWSys 2017-09-30 (f108739d)
 2017-09-30 10:07:56 -04:00
Kitware Robot
5dd75e3595 CMake Nightly Date Stamp 2017-09-30 00:01:04 -04:00
Rolf Eike Beer
ec30129b41 CPack: put local variable on the stack 2017-09-29 21:11:53 +02:00
Sebastian Holtermann
1d7f099d9c Autogen: Add (CMAKE_)AUTOMOC_COMPILER_PREDEFINES 2017-09-29 15:00:47 +02:00
Brad King
e182ba735e Merge topic 'defer-native-tool' 
f8cb9944 Find native build tool after determining the target system

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1317
 2017-09-29 08:57:39 -04:00
Brad King
7b7c9f7c20 Merge topic 'simplify-generator-parameters' 
29849376 try_compile: Simplify generator platform and toolset propagation

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1318
 2017-09-29 08:56:45 -04:00
Brad King
59285ee58e Merge topic 'add-vs-shader-properties' 
49dab3eb VS: Add VS_SHADER_OUTPUT_HEADER_FILE and VS_SHADER_VARIABLE_NAME properties.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1319
 2017-09-29 08:56:04 -04:00
Brad King
194dd9ea8b Merge topic 'autogen-macro-names2' 
93c8d55d Autogen: Update (CMAKE_)AUTOMOC_MACRO_NAMES release notes
084ace47 Autogen: Tests: Update AUTOMOC_MACRO_NAMES test
08041dd1 Autogen: Doc: Update documentation for (CMAKE_)AUTOMOC_MACRO_NAMES
7b33d67b Autogen: Create info file directory before writing
786b5be0 Autogen: Define all macro names in CMAKE_AUTOMOC_MACRO_NAMES

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1321
 2017-09-29 08:53:13 -04:00
Brad King
460a94e29f Merge topic 'autogen-cmp0071-warning' 
ff6a5125 Autogen: Doc: Add examples to the SKIP_AUTO* documentations
8831818f Autogen: Doc: Update CMP0071 description
b0775c75 Autogen: Offer solution for CMP0071 in warning message

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1322
 2017-09-29 08:52:44 -04:00
Brad King
e6e32101d8 Merge topic 'cxx11-eq-delete' 
b8018135 Use C++11 '= delete' instead of CM_EQ_DELETE
42f4e697 Drop unused CMake_HAVE_CXX_UNIQUE_PTR macro

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1326
 2017-09-29 08:49:02 -04:00
Brad King
e24e0ff6fa Merge topic 'clang-tidy' 
77f674be Fix some occurrences of readability-braces-around-statements
f0bab294 Convert some leftover loops to C++11 range-based loop
b5d7f5b0 Fix occurrences of readability-non-const-parameter
9a2da339 Fix some occurrences of readability-avoid-const-params-in-decls
870dd06d Fix left-over occurrences of else-after-return
2033abff Fix minor clang-tidy findings
79b8c380 Improve several occurrences of vector::push_back in loops
a45928cd Fix some occurrences of missing override keywords
...

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1292
 2017-09-29 08:48:16 -04:00
Kitware Robot
f920ffd8f3 CMake Nightly Date Stamp 2017-09-29 00:01:03 -04:00