Commit Graph

22020 Commits

Author SHA1 Message Date
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
Kitware Robot 7f5842d7d9 CMake Nightly Date Stamp 2017-01-13 00:01:05 -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