Commit Graph

22111 Commits

Author SHA1 Message Date
Brad King
65124233da Merge topic 'file-GLOB-empty-no-crash'
2bba0bfc file: Fix crash on GLOB with no expressions after LIST_DIRECTORIES
2017-01-17 09:04:53 -05:00
Brad King
aa63ab6d3e Merge topic 'expand_custom_commands'
7c8ab7dd add_custom_{command,target}: Add COMMAND_EXPAND_LISTS option
2017-01-17 09:04:50 -05:00
Alexander Voitenko
3fc4a2b71a QtIFW: Added new options to QtIFW cpack generator for modifying wizard style 2017-01-17 14:12:02 +03:00
Kitware Robot
020cba316b CMake Nightly Date Stamp 2017-01-17 00:01:04 -05:00
Gregor Jasny
d9f836e956 Add a getter for manually added target dependencies
Closes: #16165
2017-01-16 22:38:24 +01:00
Brad King
ee77941a1f Merge branch 'upstream-KWSys' into update-kwsys
* upstream-KWSys:
  KWSys 2017-01-16 (a423d829)
2017-01-16 14:06:29 -05:00
Brad King
f38644527c cmCTestBuildHandler: Fix warning in FragmentCompare signature
```
warning: the specified comparator type does not provide a const call
operator [-Wuser-defined-warnings]
```

Reported-by: Sean McBride <sean@rogue-research.com>
2017-01-16 13:52:17 -05:00
Craig Scott
298b5b31ca CTest: Ensure setup/cleanup ordering even when fixture not required
Closes: #16558
2017-01-16 11:29:24 -05:00
Brad King
35ad12f99e Merge topic 'source_group-tree'
b42330be source_group: Add options create groups matching directory tree
2017-01-16 11:01:38 -05:00
Brad King
47d391d71d Merge topic 'csharp_simple'
397b8546 VS: added documentation for C# support
a7dd8e66 VS: added support for C# (for Visual Studio 2010, 2012, 2013, 2015)
6fda6005 VS: renamed target property VS_USER_PROPS_CXX to VS_USER_PROPS
2017-01-16 11:01:29 -05:00
Brad King
a67baf0af0 Merge topic 'Autogen_Config'
bb670d96 Autogen: Generators: Remove space
3f86032b Autogen: Generators: Rename requiresMocing method
f24e1d37 Autogen: Generators: Fix clang-tidy readability-else-after-return
f27c5852 Autogen: Initializer: Add old settings file to clean files
d7d2cb48 Autogen: Generators: Save the UIC/RCC settings that were actually used
721997a7 Autogen: Generators: Dedicated generateAll variables for MOC/UIC/RCC
9f47d326 Autogen: Generators: Save the MOC settings that were actually used
597124ba Autogen: Generators: Add function to read makefile definitions config aware
2b400b24 Autogen: Generators: Move moc/uic/rcc executable test to generate method
edf0b8a5 Autogen: Generators: Rename GenerateFoo methods to FooGenerate
06430919 Autogen: Generators: Use FileAbsentOrOlder for UIC tests
ca179f2a Autogen: Generators: Use FileAbsentOrOlder for MOC tests
119791ae Autogen: Generators: Introduce FileAbsentOrOlder function
95e4cfc5 Autogen: Generators: Simplify (and fix) JoinExts function
6c55755b Autogen: Generators: Make class static method a source static function
1491ab1c Autogen: Generators: Make class static method a source static function
...
2017-01-16 11:01:26 -05:00
Brad King
9aa2ec7787 Merge topic 'fast-local-and-strip-install'
1b63ce86 Makefiles: Make fast local and strip install truly fast
2017-01-16 11:01:23 -05:00
Brad King
4433be6bce Merge topic 'cuda-no-def-file-for-device'
05dbc940 CUDA: Don't use module definition `.def` files for device linking
2017-01-16 11:01:20 -05:00
Brad King
743085a579 Merge topic 'cuda_propagate_flags_when_dlink_on_executables'
8d1f9e5b CUDA: Now pass correct FLAGS when device link cuda executables.
dc5051f1 CUDA: Test that CUDA flags are used when device linking executables.
2017-01-16 11:01:17 -05:00
Brad King
94332a3ed8 Merge topic 'ninja-no-static-lib-def-file'
47ffa0ea Ninja: Do not use module definition `.def` files for static libraries
2017-01-16 11:01:14 -05:00
Brad King
8a8aff612c Merge topic 'vs15-detect-from-installer'
0362c60f cmVSSetupHelper: Simplify use of EnumerateAndChooseVSInstance
577f721f VS: Fix detection of VS 2017 installation with WindowsStore
2017-01-16 11:01:11 -05:00
Brad King
4680e469f6 Merge topic 'usage-cpack-ifw-configure-file'
49717993 QtIFW: Improved packaging
2017-01-16 11:01:08 -05:00
Brad King
0f3bb10dbe Merge topic 'fix_repeat_until_fail_duplicated_output'
a1058637 CTest: Properly reset output to avoid duplication with --repeat-until-fail
2017-01-16 11:01:02 -05:00
Brad King
2ad405202e Merge topic 'sparc-libatomic'
cda9a904 Explicitly link against libatomic on Linux/sparc for `__atomic_fetch_add_4`
2017-01-16 11:00:59 -05:00
Mateusz Janek
b42330be21 source_group: Add options create groups matching directory tree
Add `TREE` and `PREFIX` arguments to enable this behavior.
2017-01-16 10:52:48 -05:00
Brad King
2bba0bfc2c file: Fix crash on GLOB with no expressions after LIST_DIRECTORIES
Since commit v3.3.0-rc1~318^2~1 (file: Teach GLOB to list directories
optionally, 2015-03-17) using `LIST_DIRECTORIES` followed by no
expression causes a crash.  Fix the logic to avoid the crash.

Fixes: #16565
2017-01-16 10:47:32 -05:00
Kitware Robot
7bd1d53505 CMake Nightly Date Stamp 2017-01-16 00:01:04 -05:00
Kitware Robot
be5b310cca CMake Nightly Date Stamp 2017-01-15 00:01:05 -05:00
Kitware Robot
b3d675f1cb CMake Nightly Date Stamp 2017-01-14 00:01:06 -05:00
Ed Branch
7c8ab7ddc8 add_custom_{command,target}: Add COMMAND_EXPAND_LISTS option
This option allows lists generated by generator expressions to be expanded.

Closes: #15935
2017-01-13 20:02:16 -06:00
Mike Gelfand
1b63ce865e Makefiles: Make fast local and strip install truly fast
When using a Makefiles generator, `install/local/fast` and
`install/strip/fast` targets are not at all fast.  They depend on
`install/local` and `install/strip` targets respectively instead of
`preinstall/fast` and don't contain any commands instead of repeating
commands in `install/local` and `install/strip`. The issue was
introduced by simple typos in commits v2.6.0~2825 (Adding install/local
global target for Makefile generators, 2006-08-29) and v2.6.0~1743 (add
install/strip target for makefile generators, 2007-05-18).
2017-01-13 09:16:16 -05:00
Michael Stürmer
a7dd8e6692 VS: added support for C# (for Visual Studio 2010, 2012, 2013, 2015) 2017-01-13 09:28:13 +01:00
Michael Stürmer
6fda6005b3 VS: renamed target property VS_USER_PROPS_CXX to VS_USER_PROPS 2017-01-13 09:27:21 +01:00
Kitware Robot
7f5842d7d9 CMake Nightly Date Stamp 2017-01-13 00:01:05 -05:00
Sebastian Holtermann
bb670d9625 Autogen: Generators: Remove space 2017-01-13 00:00:45 +01:00
Sebastian Holtermann
3f86032bda Autogen: Generators: Rename requiresMocing method 2017-01-13 00:00:45 +01:00
Sebastian Holtermann
f24e1d37ce Autogen: Generators: Fix clang-tidy readability-else-after-return 2017-01-13 00:00:45 +01:00
Sebastian Holtermann
f27c5852b0 Autogen: Initializer: Add old settings file to clean files 2017-01-13 00:00:44 +01:00
Sebastian Holtermann
d7d2cb48c6 Autogen: Generators: Save the UIC/RCC settings that were actually used 2017-01-13 00:00:44 +01:00
Sebastian Holtermann
721997a7a2 Autogen: Generators: Dedicated generateAll variables for MOC/UIC/RCC 2017-01-13 00:00:44 +01:00
Sebastian Holtermann
9f47d32697 Autogen: Generators: Save the MOC settings that were actually used 2017-01-13 00:00:44 +01:00
Sebastian Holtermann
597124ba8e Autogen: Generators: Add function to read makefile definitions config aware 2017-01-13 00:00:44 +01:00
Sebastian Holtermann
2b400b2421 Autogen: Generators: Move moc/uic/rcc executable test to generate method 2017-01-13 00:00:44 +01:00
Sebastian Holtermann
edf0b8a52b Autogen: Generators: Rename GenerateFoo methods to FooGenerate 2017-01-13 00:00:44 +01:00
Sebastian Holtermann
06430919f4 Autogen: Generators: Use FileAbsentOrOlder for UIC tests 2017-01-13 00:00:43 +01:00
Sebastian Holtermann
ca179f2afc Autogen: Generators: Use FileAbsentOrOlder for MOC tests 2017-01-13 00:00:43 +01:00
Sebastian Holtermann
119791ae52 Autogen: Generators: Introduce FileAbsentOrOlder function 2017-01-13 00:00:43 +01:00
Sebastian Holtermann
95e4cfc594 Autogen: Generators: Simplify (and fix) JoinExts function 2017-01-13 00:00:43 +01:00
Sebastian Holtermann
6c55755bdd Autogen: Generators: Make class static method a source static function 2017-01-13 00:00:43 +01:00
Sebastian Holtermann
1491ab1c66 Autogen: Generators: Make class static method a source static function 2017-01-13 00:00:43 +01:00
Sebastian Holtermann
29112c9a69 Autogen: Generators: Static function upper case rename 2017-01-13 00:00:42 +01:00
Sebastian Holtermann
6d333be14d Autogen: Generators: Static function upper case rename 2017-01-13 00:00:42 +01:00
Sebastian Holtermann
52688bf745 Autogen: Generators: Sort methods by task 2017-01-13 00:00:42 +01:00
Robert Maynard
8d1f9e5b85 CUDA: Now pass correct FLAGS when device link cuda executables.
Previously we had a two issues when building cuda executables
that required separable compilation. The first was that we didn't
propagate FLAGS causing any -arch / -gencode flags to be dropped, and
secondly generators such as ninja would use the CXX language flags
instead of CUDA when the executable was mixed language.
2017-01-12 15:13:36 -05:00
Robert Maynard
05dbc940b7 CUDA: Don't use module definition .def files for device linking
These files are meaningful only to the host linker.
2017-01-12 15:07:10 -05:00
Brad King
47ffa0ea5d Ninja: Do not use module definition .def files for static libraries
A module definition (`.def`) file specifies symbols to export from
a linked binary.  The librarian tool is not a linker and so should
not be given a `/DEF:...` flag with the `.def` file.  The other
generators already do not do this, so fix Ninja to be consistent.

Closes: #16537
2017-01-12 13:35:48 -05:00
Brad King
0362c60fe5 cmVSSetupHelper: Simplify use of EnumerateAndChooseVSInstance
This method short-circuits when an instance has already been chosen, so
avoid duplicating this check at call sites.
2017-01-12 11:32:44 -05:00
Konstantin Podsvirov
4971799360 QtIFW: Improved packaging
Now cpack_ifw_configure_file command used to configure
template files of component's scripts.

Now for these template files we can use QtIFW predefined
variables (like @VAR@) and template variables
in Qt/IFW/SDK/Creator templates style (like %VAR%).

Now CMake_INSTALL_INFIX advanced variable used to configure
CMake installation destination when package as part of QtSDK.
2017-01-12 19:29:52 +03:00
Brad King
577f721fb7 VS: Fix detection of VS 2017 installation with WindowsStore
Fix logic in cmVSSetupAPIHelper::IsVS2017Installed to work correctly on
repeat calls.

Closes: #16549
2017-01-12 11:29:35 -05:00
Brad King
728820f3ea Merge topic 'cuda-windows'
f9a810f7 CUDA: Enable CudaOnly.SeparateCompilation test runtime calls
5599d858 CUDA: Port test cases to Windows with MSVC host compiler
11551702 CUDA: Populate NVIDIA compiler information on Windows
5365421e CUDA: Detect implicit link information on Windows
522b913f CUDA: Find MSVC binutils on Windows
02582b91 CUDA: Populate compiler PDB placeholder during device linking
d470cb70 CUDA: Use `.obj` object file extension on Windows
a2e80cb0 CUDA: Detect MSVC architecture id
65c1e012 CUDA: Detect use of MSVC host compiler
945dd207 CUDA: Allow platform files to set device linking rules
95420cea CMakeParseImplicitLinkInfo: Add support for MSVC invoked by CUDA nvcc
2017-01-12 10:41:57 -05:00
Brad King
02582b91ad CUDA: Populate compiler PDB placeholder during device linking
The device link step runs the host compiler internally so we need to use
the proper compiler PDB file with MSVC.
2017-01-12 10:39:03 -05:00
Brad King
d470cb7007 CUDA: Use .obj object file extension on Windows 2017-01-12 10:39:02 -05:00
Brad King
a2e80cb085 CUDA: Detect MSVC architecture id 2017-01-12 10:39:02 -05:00
Brad King
51255a7c7a Merge topic 'asan_overriding_user_options'
efff7086 ctest_memcheck: Append sanitizers user options at the end to allow overriding
2017-01-12 10:22:04 -05:00
Brad King
88a816c6b9 Merge topic 'vs15-detect-from-installer'
3a97a371 VS: Port Visual Studio Setup third-party header to older VS versions
c93e85d8 VS: Use Visual Studio Installer to locate VS 2017
18c8278b VS: Add helper class to interact with Visual Studio Installer
d47bda00 VS: Fix VS 2017 Windows Store toolset selection
efdfc26e VS: Drop check for VS 15 Express Edition
ad5b702c VS: Port Visual Studio Setup third-party header to MinGW
def7395f VS: Add Visual Studio Setup third-party header
2017-01-12 10:20:48 -05:00
Brad King
e15106b2f1 Merge topic 'cmListFileLexer-warning-fix'
6e6253ea cmListFileLexer: Fix signature of cmListFileLexer_New
2017-01-12 10:20:45 -05:00
Brad King
ec09e91a65 Merge topic 'cmake-install-infix'
0315ab7a Add installation infix (empty by default)
2017-01-12 10:20:38 -05:00
Brad King
082456e5a3 Merge topic 'codeblocks-nmake-makefiles-jom'
3462118c Allow CodeBlocks for NMake Makefiles JOM
2017-01-12 10:20:27 -05:00
Brad King
c9a0b14153 Merge topic 'cmFileMonitor-skip-empty-names'
7bad99b0 cmake-server: Do not try watching subdirectories with empty names
2017-01-12 10:20:21 -05:00
Sylvain Joubert
a105863772 CTest: Properly reset output to avoid duplication with --repeat-until-fail 2017-01-12 11:32:58 +01:00
Kitware Robot
053adc60ee CMake Nightly Date Stamp 2017-01-12 00:01:06 -05:00
Aleix Pol
7bad99b0d3 cmake-server: Do not try watching subdirectories with empty names
`cmsys::SystemTools::SplitPath` will return empty segments on paths
where there's duplicaded consequent slashes (e.g.  `/home/dir/my//stuff`).
This makes the cmFileWatcher choke.  Teach cmFileMonitor to skip these
empty segments.

Closes: #16531
2017-01-11 13:48:41 -05:00
Sylvain Joubert
efff7086c6 ctest_memcheck: Append sanitizers user options at the end to allow overriding 2017-01-11 19:27:45 +01:00
Brad King
12d5ccd10a Merge topic 'ctest_memcheck-leak_sanitizer'
e537bd91 ctest_memcheck: do not add detect_leaks=1 to ASAN_OPTIONS
0a2e5885 ctest_memcheck: join *SAN_OPTIONS with :
cdacfbd2 MEMORYCHECK_SUPPRESSIONS_FILE: add support for sanitizers
cf590c12 ctest_memcheck: add support for standalone LeakSanitizer
2017-01-11 09:58:55 -05:00
Brad King
9a67022275 Merge topic 'UseSWIG-implicit-depends'
b8968b4b UseSWIG: Automatically scan dependencies of SWIG files for Makefiles
2017-01-11 09:58:52 -05:00
Brad King
2eb5596503 Merge topic 'Autogen_Simplify'
7db05f42 AUTOGEN: Release notes for SKIP_AUTOX
6eabac26 AUTOGEN: Documentation update: cmake-qt, AUTOMOC, AUTOUIC, AUTORCC
cbc07d33 AUTOGEN: Documentation for SKIP_AUTOX source file properties
c17e0a3a AUTOGEN: Tests: AUTORCC SKIP_AUTORCC and SKIP_AUTOGEN test
53787bf8 AUTOGEN: Tests: AUTOUIC SKIP_AUTOUIC and SKIP_AUTOGEN test
8dbdd3e7 AUTOGEN: Tests: AUTOMOC SKIP_AUTOMOC and SKIP_AUTOGEN test
0699760d AUTOGEN: Generators: Do moc/uic skip test during file list generation
a84f0bb7 AUTOGEN: Generators: Message upper/lower case unification
7b766b83 AUTOGEN: Generators: Use single moc/uic skip test method only
2964b8cc AUTOGEN: Generators: Use AUTOMOC/UIC/RCC instead of AUTOGEN in messages
d58b6bf3 AUTOGEN: Generators: Moc/UicSkipTest methods
94c319f9 AUTOGEN: Generators: Use separate header lists for MOC and UIC
966be439 AUTOGEN: Generators: Be verbose about skipping files
de531432 AUTOGEN: Generators: Remove unused variable
d8e45536 AUTOGEN: Initializer: Always remember skipped files
d9313a82 AUTOGEN: Initializer: Enable SKIP_AUTOGEN on all AUTOGEN generated sources
...
2017-01-11 09:58:40 -05:00
Brad King
0884c9e46a Merge topic 'SublimeText-no-VERBOSE'
154def30 Sublime: Do not build with verbose output
2017-01-11 09:58:28 -05:00
Brad King
6e6253ea88 cmListFileLexer: Fix signature of cmListFileLexer_New
Add explicit `(void)` instead of an empty argument list, as suggested
by `-Wstrict-prototypes`.
2017-01-11 09:32:00 -05:00
Konstantin Podsvirov
0315ab7a31 Add installation infix (empty by default) 2017-01-11 14:10:39 +03:00
Kitware Robot
3e5fbbd6cd CMake Nightly Date Stamp 2017-01-11 00:01:06 -05:00
Alexey Sokolov
b8968b4b39 UseSWIG: Automatically scan dependencies of SWIG files for Makefiles
Issue: #4147
2017-01-10 13:05:59 -05:00
Konstantin Podsvirov
3462118c6d Allow CodeBlocks for NMake Makefiles JOM 2017-01-10 19:26:21 +03:00
Richard Collins
154def305e Sublime: Do not build with verbose output
Remove the hard-coded use of `make VERBOSE=1` and `ninja -v`.
2017-01-10 10:52:48 -05:00
Brad King
914728f8d7 Merge topic '16204-regex-explorer-match-all'
4164078c cmake-gui: Add MATCHALL option to Regex Explorer
2017-01-10 09:34:58 -05:00
Brad King
c43cf158d7 Merge topic 'cpack-new-tests'
36bc7e4c store old locale to a temporary variable
05c14ea0 RunCMake.CPack_* add COMPONENT to minimal test
5b0a64eb CPack/Archive minimal tests for more formats
2017-01-10 09:34:55 -05:00
Brad King
2c8eb2696a Merge topic 'cpack-deb-md5sums-paths-fix'
6daa2d38 CPack/Deb invalid md5sums file fix
2017-01-10 09:34:52 -05:00
Brad King
9239141e95 Merge topic 'cmake-server-do-not-crash-on-interface-lib-for-master'
0471d13e Merge branch 'cmake-server-do-not-crash-on-interface-lib' into cmake-server-do-not-crash-on-interface-lib-for-master
c0bd1eb6 server-mode: Do not crash when running into INTERFACE_LIBRARY
33e628ee server-mode: Do not crash when running into INTERFACE_LIBRARY
2017-01-10 09:34:43 -05:00
Gregor Jasny
4164078c85 cmake-gui: Add MATCHALL option to Regex Explorer
Closes: #16204
2017-01-10 09:28:13 -05:00
Sebastian Holtermann
0699760d5c AUTOGEN: Generators: Do moc/uic skip test during file list generation 2017-01-10 12:49:16 +01:00
Sebastian Holtermann
a84f0bb726 AUTOGEN: Generators: Message upper/lower case unification 2017-01-10 12:49:16 +01:00
Sebastian Holtermann
7b766b8395 AUTOGEN: Generators: Use single moc/uic skip test method only 2017-01-10 12:49:16 +01:00
Sebastian Holtermann
2964b8cca4 AUTOGEN: Generators: Use AUTOMOC/UIC/RCC instead of AUTOGEN in messages 2017-01-10 12:49:16 +01:00
Sebastian Holtermann
d58b6bf31c AUTOGEN: Generators: Moc/UicSkipTest methods 2017-01-10 12:49:16 +01:00
Sebastian Holtermann
94c319f933 AUTOGEN: Generators: Use separate header lists for MOC and UIC
This is necessary for the skipMoc and skipUic lists to work properly.
2017-01-10 12:49:16 +01:00
Sebastian Holtermann
966be439e0 AUTOGEN: Generators: Be verbose about skipping files 2017-01-10 12:49:15 +01:00
Sebastian Holtermann
de53143288 AUTOGEN: Generators: Remove unused variable 2017-01-10 12:49:15 +01:00
Sebastian Holtermann
d8e45536fb AUTOGEN: Initializer: Always remember skipped files 2017-01-10 12:49:15 +01:00
Sebastian Holtermann
d9313a8290 AUTOGEN: Initializer: Enable SKIP_AUTOGEN on all AUTOGEN generated sources 2017-01-10 12:49:15 +01:00
Sebastian Holtermann
32d3540e09 AUTOGEN: Initializer: Introduce SKIP_AUTOGEN checks 2017-01-10 12:49:15 +01:00
Sebastian Holtermann
e7280a7f17 AUTOGEN: Rename config variables
The new names describe the variables use cases better.
2017-01-10 12:49:15 +01:00
Sebastian Holtermann
63d3ca4c1c AUTOGEN: Make skipMoc and skipUic blacklists behave the same way
Before skipMoc was a list of files that were not included in the
sources. Now the skipMoc files are added to the sources as well in case
they are needed for uic processing. skipMoc becomes a blacklist just like
skipUic.
2017-01-10 12:49:15 +01:00
Sebastian Holtermann
6ae19bf32e AUTOGEN: Generators: Add dedicated method for moc content parsing 2017-01-10 12:49:14 +01:00
Sebastian Holtermann
9986da4f0f AUTOGEN: Generators: Split config SKIP_MOC and SKIP_UIC into vectors 2017-01-10 12:49:14 +01:00
Sebastian Holtermann
d51cc88e84 AUTOGEN: Generators: Split config headers/sources into vector 2017-01-10 12:49:14 +01:00
Sebastian Holtermann
cf1d5a9cdb AUTOGEN: Generators: Rename ParseForUic method 2017-01-10 12:49:14 +01:00