Commit Graph

22046 Commits

Author SHA1 Message Date
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
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
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
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