Commit Graph
21992 Commits
Author SHA1 Message Date
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
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
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
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
Sebastian Holtermann f962275987 AUTOGEN: Generators: Group static function definitions 2017-01-10 12:49:14 +01:00
Sebastian Holtermann c736c41ad1 AUTOGEN: Generators: Use precompiled regular expressions 2017-01-10 12:49:14 +01:00
Sebastian Holtermann cbd650c264 AUTOGEN: Generators: Use unified ParseSourceFile and drop old methods 2017-01-10 12:49:14 +01:00
Sebastian Holtermann 0b1527ff3d AUTOGEN: Generators: Introduce unified ParseSourceFile
The new cmQtAutoGenerators::ParseSourceFile method combines the
functionality of ParseCppFile and StrictParseCppFile in a single method
to avoid code duplication. Relaxed or strict mode is selected by an
additional bool argument.
2017-01-10 12:49:13 +01:00
Sebastian Holtermann 2b9d795e63 AUTOGEN: Generators: Comments 2017-01-10 12:49:13 +01:00
Sebastian Holtermann 2cfcdf757d AUTOGEN: Generators: Variable rename 2017-01-10 12:49:13 +01:00
Sebastian Holtermann 2f67aef23d AUTOGEN: Generators: Cleanup and optimize ParseForUic method 2017-01-10 12:49:13 +01:00
Sebastian Holtermann 794fdf40a1 AUTOGEN: Generators: Cleanup variable initialization 2017-01-10 12:49:13 +01:00
Sebastian Holtermann a1e49bb155 AUTOGEN: Generators: rename makeParentDirectory to MakeParentDirectory 2017-01-10 12:49:13 +01:00
Kitware Robot aff368bb84 CMake Nightly Date Stamp 2017-01-10 00:01:04 -05:00
Tobias Hunger c0bd1eb6d0 server-mode: Do not crash when running into INTERFACE_LIBRARY
Closes: #16539
2017-01-09 16:40:46 -05:00
Brad King 68d13665e0 Merge branch 'cmake-server-do-not-crash-on-interface-lib' into release 2017-01-09 16:33:02 -05:00
Tobias Hunger 33e628ee80 server-mode: Do not crash when running into INTERFACE_LIBRARY
Closes: #16539
2017-01-09 16:31:11 -05:00
Brad King 4ce6cd2bcf Merge topic '15687-revisit-xcode-system-include'
88f07fb4 Xcode: Properly mark SYSTEM includes as such
2017-01-09 16:27:28 -05:00