mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-01-28 09:58:53 -06:00
Code Issues Packages Projects Releases Wiki Activity
36,983 Commits 2 Branches 390 Tags
9538d22d955a0b101548019003f2d5c7ba833d77
Commit Graph

23266 Commits

Author SHA1 Message Date
Kitware Robot
9538d22d95 CMake Nightly Date Stamp 2017-08-25 00:01:07 -04:00
Brad King
797196c8a7 Merge topic 'vs-sdk-refs' 
efd0c013 VS: Fix VS_SDK_REFERENCES when target is not a Windows 10 app

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1166
 2017-08-24 09:34:43 -04:00
Brad King
94299c496d Merge topic 'ninja-gfortran-fpreprocessed' 
90a34ff7 Ninja: Fix references to source files in gfortran diagnostics

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1146
 2017-08-24 09:33:55 -04:00
Kitware Robot
fe19fda2aa CMake Nightly Date Stamp 2017-08-24 00:01:11 -04:00
Roc Ramon
efd0c01337 VS: Fix VS_SDK_REFERENCES when target is not a Windows 10 app 
Close the `<ItemGroup>` element whenever it is opened.
 2017-08-23 15:43:46 -04:00
Raul Laasner
90a34ff791 Ninja: Fix references to source files in gfortran diagnostics 
The Ninja generator preprocesses and compiles separately for Fortran.
When compiling, tell gfortran that the source is already preprocessed so
that it will honor the `# <line>` directives when producing diagnostics
messages.

Fixes: #17160
 2017-08-23 15:32:44 -04:00
Brad King
fc1aaf1432 Merge topic 'autogen-optimize-cleanup' 
8e452e67 Remove AUTOGEN variables from cmSourceFile and cmMakefile
0f2e178f Autogen: Don't use cmMakefile::GetQtUiFilesWithOptions
13bb716f Autogen: Fix and extend SKIP_AUTOMOC test
727247c3 Autogen: Read skip files from makefile
1eb1b409 Autogen: Remove VS specific code exclusion
54ec2a8b Autogen: Initializer file type scanning optimizations
cf7b3b96 Autogen: Initializer optimizations and cleanups

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1171
 2017-08-23 08:21:27 -04:00
Daniel Pfeifer
ac6660b671 Merge topic 'cxx11-unordered' 
cbcfb79f Use C++11 unordered containers

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1174
 2017-08-23 05:11:40 -04:00
Daniel Pfeifer
7526b1ed32 Merge topic 'cm_fallthrough' 
e4aafbf5 Fix CM_FALLTHROUGH with -Wunused-parameter

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1170
 2017-08-23 04:03:18 -04:00
Kitware Robot
5490d0e685 CMake Nightly Date Stamp 2017-08-23 00:01:09 -04:00
Daniel Pfeifer
cbcfb79f9c Use C++11 unordered containers 2017-08-22 23:05:27 +02:00
Sebastian Holtermann
8e452e67e9 Remove AUTOGEN variables from cmSourceFile and cmMakefile 2017-08-22 19:10:32 +02:00
Sebastian Holtermann
0f2e178f65 Autogen: Don't use cmMakefile::GetQtUiFilesWithOptions 
The purpose of this patch is to allow later removal of
AUTOGEN specific variables in cmMakefile and cmSourceFile.
 2017-08-22 19:10:32 +02:00
Sebastian Holtermann
727247c316 Autogen: Read skip files from makefile 
This allows to pass SKIP_AUTOMOC hints to the
FOO_autogen target from files that are not listed
in the target sources.

The problem was that if main.cpp was listed in the source
but not main.h, then SKIP_AUTOMOC for main.h was ignored.
 2017-08-22 18:43:34 +02:00
Sebastian Holtermann
1eb1b409c2 Autogen: Remove VS specific code exclusion 
The amount of disabled code was small.
Also the #ifdef tests were confusing and made
testing on non Windows machines more difficult.
 2017-08-22 18:43:34 +02:00
Sebastian Holtermann
54ec2a8bcf Autogen: Initializer file type scanning optimizations 2017-08-22 17:13:59 +02:00
Sebastian Holtermann
cf7b3b9671 Autogen: Initializer optimizations and cleanups 2017-08-22 17:13:59 +02:00
Brad King
8a0ed37f61 Merge topic 'ccg-no-mutable' 
52527468 cmCustomCommandGenerator: Avoid mutable state

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1145
 2017-08-22 08:27:04 -04:00
Brad King
e4aafbf596 Fix CM_FALLTHROUGH with -Wunused-parameter 
Fix the test code that we `try_compile` to avoid unused parameter
warnings that cause the check to fail.
 2017-08-22 08:13:30 -04:00
Kitware Robot
2d41ec5036 CMake Nightly Date Stamp 2017-08-22 00:01:08 -04:00
Craig Scott
9a0a6f91ae Merge topic 'perf-targetIter-missedGenerators' 
7bc65770 Performance: Fix a few more unnecessary vector copies missed in af3fd6f

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1157
 2017-08-21 09:13:59 -04:00
Brad King
ab5667b516 Merge topic 'autogen-macro-names' 
b3d98c6e Autogen: Add release notes for AUTOMOC_MACRO_NAMES
7529d84f Autogen: Add documentation for AUTOMOC_MACRO_NAMES
05891d8f Autogen: Add test for AUTOMOC_MACRO_NAMES
93f0ba28 Autogen: Add AUTOMOC_MACRO_NAMES support

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1156
 2017-08-21 09:02:09 -04:00
Brad King
fabb217502 Merge topic 'bootstrap-target-commands' 
ef978c1d CursesDialog: use target_include_directories for cmForm
7814d750 bootstrap: make target_* commands available

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1158
 2017-08-21 09:00:09 -04:00
Brad King
d46300be89 Merge topic 'vs-less-c_str' 
79064819 VS: remove unnecessary c_str()

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1151
 2017-08-21 08:58:39 -04:00
Kitware Robot
a1b84ac2a6 CMake Nightly Date Stamp 2017-08-21 00:01:07 -04:00
Kitware Robot
4f9ce1aeca CMake Nightly Date Stamp 2017-08-20 00:01:06 -04:00
Kitware Robot
4bf219a43f CMake Nightly Date Stamp 2017-08-19 00:01:08 -04:00
Daniel Pfeifer
ef978c1dea CursesDialog: use target_include_directories for cmForm 2017-08-18 22:25:20 +02:00
Daniel Pfeifer
7814d75023 bootstrap: make target_* commands available 2017-08-18 21:48:14 +02:00
Aaron Orenstein
7bc6577017 Performance: Fix a few more unnecessary vector copies missed in af3fd6f 2017-08-18 07:59:52 -07:00
Sebastian Holtermann
93f0ba2823 Autogen: Add AUTOMOC_MACRO_NAMES support 
Closes #17176
 2017-08-18 12:32:04 +02:00
Kitware Robot
10edb0c7d5 CMake Nightly Date Stamp 2017-08-18 00:01:08 -04:00
Craig Scott
999192b0f7 Merge topic 'perf-targetIterAndLookup-cmLocalGenerator' 
af3fd6f2 Performance: Add an index to Change cmLocalGenerator::GeneratorTargets.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1136
 2017-08-17 16:38:24 -04:00
Vitaly Stakhovsky
79064819a6 VS: remove unnecessary c_str() 2017-08-17 14:41:01 -04:00
Kitware Robot
d3760354a5 CMake Nightly Date Stamp 2017-08-17 00:01:06 -04:00
Aaron Orenstein
af3fd6f22f Performance: Add an index to Change cmLocalGenerator::GeneratorTargets. 
Add an index to Change cmLocalGenerator::GeneratorTargets for faster lookup by
name.

Also changed a bunch of uses of cmLocalGenerator::GetGeneratorTargets() to take
const references instead of copying the vector.

Represent generator targets as a map (name -> target) to make name lookups more
efficient instead of looping through the entire vector to find the desired one.
 2017-08-16 15:35:38 -07:00
Brad King
a2405b4378 Merge topic 'lint-fixes' 
cbcf6458 cmServerProtocol: Do not move into json::Value::append()
91417e4c cmServerProtocol: pass cmBacktraceRange by value

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1143
 2017-08-16 10:51:48 -04:00
Brad King
d817bbb8df Merge topic 'string_prepend' 
d8ecc254 Add PREPEND sub-command to string command

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1129
 2017-08-16 10:50:38 -04:00
Brad King
1e77d0dbef Merge topic 'autogen-autouic-lookup' 
6c5e03d6 Merge branch 'backport-autogen-autouic-lookup' into autogen-autouic-lookup
fb5db079 Autogen: Extend AUTOUIC search paths test
d8a99dd2 Autogen: Update AUTOUIC documentation for search paths
02e6c548 Autogen: Restore AUTOUIC lookup paths from 3.8.2

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1140
 2017-08-16 10:43:17 -04:00
Kitware Robot
131af5d591 CMake Nightly Date Stamp 2017-08-16 00:01:07 -04:00
Daniel Pfeifer
cbcf6458f4 cmServerProtocol: Do not move into json::Value::append() 
CMake's copy of json-cpp is not aware of rvalues yet.  It is confusing
to pass the result of std::move to a function that takes a const&
because no move will actually happen.  This change may be reverted once
CMake upgrades to a new version of json-cpp.
 2017-08-15 22:43:08 +02:00
Daniel Pfeifer
91417e4ca3 cmServerProtocol: pass cmBacktraceRange by value 2017-08-15 22:37:05 +02:00
Brad King
6c5e03d6d4 Merge branch 'backport-autogen-autouic-lookup' into autogen-autouic-lookup 2017-08-15 13:23:11 -04:00
Brad King
f2cab9855b Merge topic 'server-allow-cache' 
9b3c5ccf Server: test cache after reconnect
1df38758 cmServerProtocol: allow 'cache' request before 'configure'
187332b2 cmServerProtocol: fix test of empty values

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !977
 2017-08-15 13:17:49 -04:00
Brad King
8cfd52981d Merge topic 'autogen-less-verbose' 
53640a46 Autogen: Only print Qt Autogenerator messages when verbose

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1133
 2017-08-15 13:16:35 -04:00
Brad King
e1c92163d3 Merge topic 'update-kwsys' 
060cef0c Merge branch 'upstream-KWSys' into update-kwsys
9e002621 KWSys 2017-08-11 (e1006189)

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1130
 2017-08-15 13:09:40 -04:00
Brad King
8fb9a5770a Merge topic 'cpackifw-package-file-extension' 
45623e72 CPackIFW: Add CPACK_IFW_PACKAGE_FILE_EXTENSION variable

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Craig Scott <craig.scott@crascit.com>
Merge-request: !1117
 2017-08-15 13:08:26 -04:00
Sebastian Holtermann
02e6c54813 Autogen: Restore AUTOUIC lookup paths from 3.8.2 
When encountering an `#include "<PATH>ui_<BASE>.h"` statement,
search for `<BASE>.ui` in
 - <SOURCE_DIR>/<BASE>.ui
 - <SOURCE_DIR>/<PATH><BASE>.ui
 - <AUTOUIC_SEARCH_PATH>/<BASE>.ui
 - <AUTOUIC_SEARCH_PATH>/<PATH><BASE>.ui

In CMake 3.8.2 the lookup list was
  - <SOURCE_DIR>/<BASE>.ui

In CMake 3.9.[01] the lookup list was
 - <SOURCE_DIR>/<PATH><BASE.ui>
 - <AUTOUIC_SEARCH_PATH>/<PATH><BASE>.ui

Closes #17168
 2017-08-15 12:17:37 +02:00
Kitware Robot
4ca8c08f36 CMake Nightly Date Stamp 2017-08-15 00:01:04 -04:00
Kitware Robot
ce2750817b CMake Nightly Date Stamp 2017-08-14 00:01:07 -04:00