Commit Graph

22835 Commits

Author SHA1 Message Date
Brad King
10371cd6dc Merge topic 'source_group-TREE-relative-path'
4716f2be source_group: Restore TREE support for relative paths

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !852
2017-05-18 08:53:51 -04:00
Brad King
b86c5e8003 Merge topic 'fix-invalid-export-name'
8d754ad5 bindexplib: Skip symbols containing a dot (.)

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !855
2017-05-18 08:50:47 -04:00
Brad King
23b3d46e96 Merge topic 'update-kwsys'
16ebd9f6 Merge branch 'upstream-KWSys' into update-kwsys
7be70ca6 KWSys 2017-05-16 (fe1f22ce)

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !856
2017-05-18 08:48:48 -04:00
Brad King
cb8325fb4a Merge topic 'ninja-compile_commands.json'
b554caf7 Ninja: List compile_commands.json as generated by CMake

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !849
2017-05-18 08:47:47 -04:00
Kitware Robot
d1233a38cb CMake Nightly Date Stamp 2017-05-18 00:01:04 -04:00
Mateusz Janek
4716f2be83 source_group: Restore TREE support for relative paths
The fix in commit v3.8.1~4^2 (source_group: Fix TREE with root that is
not current source dir, 2017-04-20) accidentally broke support for
specifying paths relative to the source directory.  Fix it and add a
test covering the case.

While at it, fix a typo in a variable name.

Fixes: #16876
2017-05-17 09:04:02 -04:00
Kitware Robot
3f25f873f8 CMake Nightly Date Stamp 2017-05-17 00:01:05 -04:00
Brad King
16ebd9f615 Merge branch 'upstream-KWSys' into update-kwsys
* upstream-KWSys:
  KWSys 2017-05-16 (fe1f22ce)
2017-05-16 11:39:01 -04:00
Albert Ziegenhagel
8d754ad5e7 bindexplib: Skip symbols containing a dot (.)
Symbols including a dot are not valid and result in a `LNK1242` error
when trying to create a library from the def file.  Such symbols happen
to be in object files when using PGI Fortran on Windows and compiling
with debug symbols enabled.  Those symbols do not need to be exported.
2017-05-16 11:22:48 -04:00
Kevin Puetz
b554caf753 Ninja: List compile_commands.json as generated by CMake
This fixes a false-positive `CMP0058` warning if any custom rules depend
on `compile_commands.json` (e.g. to trigger rerunning clang-tooling
utilities).

Fixes: #16444
2017-05-16 10:21:22 -04:00
Brad King
e69e4448fb Merge topic 'xcode-try_compile-scheme'
c608000a Xcode: Work around xcodebuild spurious hangs in try_compile
b8e707a6 Xcode: Refactor internal decision for scheme generation

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !850
2017-05-16 09:57:47 -04:00
Brad King
8475734cb3 Merge topic 'early-config-name'
eeb47fbe cmLocalCommonGenerator: Save CMAKE_BUILD_TYPE on construction

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !848
2017-05-16 09:55:51 -04:00
Brad King
ef8ac5ad5a Merge topic 'cpackifw-i18n'
72ac7ad9 CPackIFW: Internationalization Support

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !748
2017-05-16 09:55:29 -04:00
Brad King
67d5593efa Merge topic 'mingw-w64-compile'
9557b403 cmFileCommand: Fix build on mingw-w64
845f5e3c bootstrap: fix build on mingw-w64

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !837
2017-05-16 09:52:42 -04:00
Kitware Robot
1867856f6a CMake Nightly Date Stamp 2017-05-16 00:01:05 -04:00
Aleksey Chernov
9557b403f5 cmFileCommand: Fix build on mingw-w64
Include header needed for `CP_ACP`.
2017-05-15 14:25:37 -04:00
Brad King
c608000a2a Xcode: Work around xcodebuild spurious hangs in try_compile
`xcodebuild` occasionally hangs on some macOS machines (and can be
reproduced independent of CMake).  It only happens a few times in 1000
runs, but configuration of a large project calls `try_compile` many
times and therefore frequently hangs due to this problem.  I've been
unable to reproduce the hang when using a scheme to build, so always
generate a scheme in `try_compile` projects to work around the problem.

Issue: #16752
2017-05-15 13:05:46 -04:00
Brad King
b8e707a6a1 Xcode: Refactor internal decision for scheme generation
Move the Xcode version check out to wrap everything.
2017-05-15 13:02:09 -04:00
Brad King
eeb47fbeb2 cmLocalCommonGenerator: Save CMAKE_BUILD_TYPE on construction
Copy the value to our `ConfigName` member on construction to ensure it
is available even to code paths that run before `Generate`.  We once
needed to delay this lookup until `Generate` because the local
generators were at one time created before `Configure`.  Now they are
created at generate time which is late enough to expect
`CMAKE_BUILD_TYPE` to be available.

Without this, `cmGlobalUnixMakefileGenerator3::WriteConvenienceRules`
causes use of `ConfigName` before it is populated which breaks use of
source files that depend on the `$<CONFIG>` generator expression.

Fixes: #16889
2017-05-15 11:51:57 -04:00
Brad King
dd89b24b9b Merge topic 'autogen_settings'
b95fbbe5 Autogen: Add -DWIN32 to definitions list on demand
ab39dd11 Autogen: Include moc/uic/rcc binary in settings hash

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !836
2017-05-15 10:57:20 -04:00
Brad King
bedd098a65 Merge topic 'cpack-components-handle-symlinks'
26384068 CPack test symlinks in package
6949b71f CPack unify component/monolithic package symlink handling
3eb0f080 Improved CPack tests error logging

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !841
2017-05-15 10:55:58 -04:00
Kitware Robot
52fbae0a59 CMake Nightly Date Stamp 2017-05-15 00:01:03 -04:00
Domen Vrankar
6949b71ff1 CPack unify component/monolithic package symlink handling
Non component package generation was recursing through
symlinks while monolithic package generation did not.
This was causing component archive packages to contain
both symlink and a directory with the same name on the
same level if symlink contained files which caused errors
during extraction of such packages.

Closes #16051
2017-05-14 23:45:18 +02:00
Kitware Robot
0816ebcc07 CMake Nightly Date Stamp 2017-05-14 00:01:04 -04:00
Sebastian Holtermann
b95fbbe553 Autogen: Add -DWIN32 to definitions list on demand 2017-05-13 10:25:46 +02:00
Sebastian Holtermann
ab39dd11f5 Autogen: Include moc/uic/rcc binary in settings hash 2017-05-13 10:14:23 +02:00
Kitware Robot
9d5fecde6a CMake Nightly Date Stamp 2017-05-13 00:01:09 -04:00
Konstantin Podsvirov
72ac7ad98d CPackIFW: Internationalization Support
Changes:
- DISPLAY_NAME and DESCRIPTION in CPackIFW module now is MULTI_ARGS;
- Added internationalization support for DisplayName and Description
  properties in cmCPackIFWPackage class;
- Added documentation to CPackIFW module;
- Added release note.
2017-05-13 02:34:15 +03:00
Brad King
836cb52e9a Merge topic 'command-name'
a1218f59 cmCommand: remove unused methods from interface and all implementations
4ba25a82 cmState: separate builtin and scripted commands
a44dab46 cmState: introduce method for adding scripted commands
c734c850 CTest: use new methods for builtin commands
bd14e464 cmCommands: use new methods for builtin commands
58708405 cmState: introduce methods for adding builtin commands
a890ca2f cmakemain: use script role for -P

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !829
2017-05-12 09:13:51 -04:00
Brad King
592206a157 Merge topic 'add_cuda_cxx14_flag'
036ffe81 CUDA: Add support for the C++14 standard flag.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !830
2017-05-12 09:13:19 -04:00
Kitware Robot
91d987e15c CMake Nightly Date Stamp 2017-05-12 00:01:04 -04:00
Daniel Pfeifer
a1218f59d9 cmCommand: remove unused methods from interface and all implementations 2017-05-11 19:49:06 +02:00
Daniel Pfeifer
4ba25a823e cmState: separate builtin and scripted commands 2017-05-11 19:49:06 +02:00
Daniel Pfeifer
a44dab461f cmState: introduce method for adding scripted commands 2017-05-11 19:49:06 +02:00
Daniel Pfeifer
c734c8501b CTest: use new methods for builtin commands 2017-05-11 19:49:06 +02:00
Daniel Pfeifer
bd14e46400 cmCommands: use new methods for builtin commands 2017-05-11 19:49:06 +02:00
Daniel Pfeifer
587084052b cmState: introduce methods for adding builtin commands 2017-05-11 19:49:06 +02:00
Robert Maynard
036ffe815a CUDA: Add support for the C++14 standard flag.
CUDA 9 toolkit has announced support for C++14 flag, so lets allow users
to use it.
2017-05-11 13:42:42 -04:00
Daniel Pfeifer
a890ca2f8d cmakemain: use script role for -P 2017-05-11 17:57:59 +02:00
Brad King
8e2f3582eb Merge topic 'split-sysroot'
53e89b6a Add options for separate compile and link sysroots

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !819
2017-05-11 10:00:12 -04:00
Brad King
c2ea011830 Merge topic 'cpackifw-access-refactoring'
543cf134 CPackIFW: Access refactoring

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !820
2017-05-11 09:56:49 -04:00
Brad King
9b79d2a357 Merge topic 'CMP0069-no-warn-try_compile'
469813cc CMP0069: Suppress warning if we are in 'try_compile'

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !823
2017-05-11 09:55:12 -04:00
Brad King
99b1ff714b Merge topic 'dead-code-removal'
fdd341eb cmFindCommon: remove unused function SetMakefile
67a8d907 cmExecutionStatus: Remove arguments from setters
0c519c70 bootstrap: Remove leftovers from cmBootstrapCommands

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !821
2017-05-11 09:54:19 -04:00
Kitware Robot
f1b9fe5fc4 CMake Nightly Date Stamp 2017-05-11 00:01:06 -04:00
Daniel Pfeifer
fdd341ebfd cmFindCommon: remove unused function SetMakefile 2017-05-10 15:58:28 +02:00
Ruslan Baratov
469813cce0 CMP0069: Suppress warning if we are in 'try_compile'
Fixes: #16855
2017-05-10 09:41:40 -04:00
Brad King
d43eb3aec2 Merge topic 'vs-project-guid'
776929b3 VS: Fix .vcxproj ProjectGuid element case

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !817
2017-05-10 09:27:10 -04:00
Brad King
8a19ce4767 Merge topic 'ninja-windows-command-concat'
5e0e03d9 Ninja: Fix command concatenation on Windows

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !801
2017-05-10 09:23:43 -04:00
Brad King
53f1f55599 Merge topic 'separate-command-registration'
44c0b2b7 cmCommand: remove IsScriptable
da8faa8c cmState: remove RemoveUnscriptableCommands
c3f41af2 cmMakefile: don't check IsScriptable
c2c2bbb3 cmake: register fake project commands in -P mode
c36d63cd cmake: initialize with Role that controls which commands to register
8986dec0 ctest: remove unused cmake instance

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !714
2017-05-10 09:22:46 -04:00
Kitware Robot
730cd10c64 CMake Nightly Date Stamp 2017-05-10 00:01:04 -04:00