mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-05-02 12:19:54 -05:00
Code Issues Packages Projects Releases Wiki Activity
37,026 Commits 2 Branches 401 Tags
ebc91a4452e1b2c2a1f42643d4a01deceea07a2b
Commit Graph

23292 Commits

Author SHA1 Message Date
Kitware Robot 5eb6d200f4 CMake Nightly Date Stamp 2017-08-29 00:01:08 -04:00
Brad King a6374b88d9 Merge topic 'lexer' 
ef41bf85 cmListFileLexer: regenerate with flex 2.6.4 (previously 2.6.1)
9cacb0cb cmListFileLexer: fix 'bail out on seek-errors' also in original file

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1185
 2017-08-28 09:54:36 -04:00
Brad King 55e281c3b7 Merge topic 'cpackifw-repositories-directories' 
5fe64511 CPackIFW: Add CPACK_IFW_REPOSITORIES_DIRECTORIES variable

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1150
 2017-08-28 09:53:10 -04:00
Brad King 072296fc16 Merge topic 'gnu-to-ms-ninja-support' 
d2d7ae07 Ninja: Implement support for GNUToMS

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1165
 2017-08-28 09:49:31 -04:00
Kitware Robot f8e9a848fb CMake Nightly Date Stamp 2017-08-28 00:01:08 -04:00
Daniel Pfeifer e710d6953d Merge topic 'server-cxx11' 
27d87fbd CTestCustom: Suppress exception loosening warning
7f29bbe6 server: always enable server
4614a3b2 server: backport to C++11

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1149
 2017-08-27 04:02:24 -04:00
Daniel Pfeifer 19f2a706a3 Merge topic 'cmSourceFile-Nocopy' 
687aef91 cmSourceFile: Avoid unnecessary vector copy

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1190
 2017-08-27 03:52:47 -04:00
Daniel Pfeifer b044dedecd Merge topic 'iwyu-keep-cmConfigure' 
ca2233e3 IWYU: Mark cmConfigure.h with pragma: keep

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1187
 2017-08-27 03:52:05 -04:00
Daniel Pfeifer a51d04d4bf Merge topic 'cmConfigure-fix' 
367a348a cmConfigure: Add missing #

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1189
 2017-08-27 03:51:08 -04:00
Kitware Robot 6dfb8dadc3 CMake Nightly Date Stamp 2017-08-27 00:01:06 -04:00
Sebastian Holtermann 687aef913c cmSourceFile: Avoid unnecessary vector copy 2017-08-26 14:45:46 +02:00
Daniel Pfeifer 2ade9a0264 Merge topic 'deb-libarchive-ar' 
df556e65 cmCPackDebGenerator: Use libarchive to create .deb file

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1181
 2017-08-26 08:20:41 -04:00
Daniel Pfeifer 367a348a00 cmConfigure: Add missing # 2017-08-26 08:30:49 +02:00
Daniel Pfeifer 7f29bbe6f2 server: always enable server 2017-08-26 07:46:58 +02:00
Daniel Pfeifer 4614a3b287 server: backport to C++11 2017-08-26 07:46:57 +02:00
Daniel Pfeifer ca2233e31f IWYU: Mark cmConfigure.h with pragma: keep 
Also remove `#include "cmConfigure.h"` from most source files.
 2017-08-26 07:41:04 +02:00
Kitware Robot 6285fe009d CMake Nightly Date Stamp 2017-08-26 00:01:17 -04:00
Daniel Pfeifer df556e65f2 cmCPackDebGenerator: Use libarchive to create .deb file 
Remove the copy of OpenBSD's 'ar' implementation and instead
use cmArchiveWrite with the "arbsd" format.
 2017-08-25 23:01:50 +02:00
Albert Ziegenhagel d2d7ae0738 Ninja: Implement support for GNUToMS 
Port the implementation from `cmMakefileTargetGenerator::GetLinkRule`.

Fixes: #13870
 2017-08-25 13:59:51 -04:00
Brad King ebe436eb97 Merge topic 'cxx11-nullptr' 
5962db43 Use C++11 nullptr

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1175
 2017-08-25 11:26:24 -04:00
Brad King 53305ce5b0 Merge topic 'revert-xcode-9-new-buildsystem-support' 
9ecee256 Xcode: Revert addition of "outputPaths" to custom command build phase

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1183
 2017-08-25 11:05:05 -04:00
Matthias Maennich ef41bf8531 cmListFileLexer: regenerate with flex 2.6.4 (previously 2.6.1) 
flex 2.6.3 introduces symbol remapping through macro definitions. hence the
change appears bigger than one would expect from a minor version upgrade.

In addition some manual cleanup that had to be done previously is now
obsolete. namely:
  - the size_t cast of _yybytes_len in yy_scan_bytes
    (i is now also defined int and not size_t anymore)
  - the redefinition of yyl within yy_find_action
    (yyl is now already defined as int)

Line number preprocessor directives (#line) were previously generated into
the c source file. This actually breaks debugging as debuggers have a hard
time finding the original cmListFileLexer.in.l and mapping the current
instruction to a meaningful location within that file.

The prefix "cmListFileLexer_yy" can already be set as %option directly.

For convenience also provide a sed command for all the manual steps that
need to be done after generating.

Signed-off-by: Matthias Maennich <matthias@maennich.net>
 2017-08-25 16:54:41 +02:00
Matthias Maennich 9cacb0cba4 cmListFileLexer: fix 'bail out on seek-errors' also in original file 
The commit v3.9.0-rc1~502^2 (cmListFileLexer: bail out on seek-errors,
2017-02-19) for bug # 16607 was only applied to the generated file.

Also apply the fix now to the original.

Signed-off-by: Matthias Maennich <matthias@maennich.net>
 2017-08-25 16:53:19 +02:00
Kitware Robot 9538d22d95 CMake Nightly Date Stamp 2017-08-25 00:01:07 -04:00
Daniel Pfeifer 5962db4389 Use C++11 nullptr 2017-08-24 23:39:47 +02:00
Brad King 9ecee256f8 Xcode: Revert addition of "outputPaths" to custom command build phase 
The change in commit v3.9.0~3^2 (Xcode: Add "outputPaths" to custom
command script build phase, 2017-07-13) was meant to support Xcode 9's
new build system.  However, without matching "inputPaths", Xcode will
not re-run the build phase if its outputs have already been generated.
This broke the old Xcode build system too.

Revert the change for now so at least the old Xcode build system works.
Further investigation will be needed to add proper support for Xcode 9's
new build system.

Fixes: #17178
 2017-08-24 10:56:48 -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