Commit Graph

34474 Commits

Author SHA1 Message Date
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
d1682a8514 Merge topic 'android_clang_asm'
524f5ee1 Android: Set compiler target platform when compiling ASM with Clang
2017-01-11 09:58:37 -05:00
Brad King
445ab80c44 Merge topic 'AndroidTestUtilities-fix-cleanup'
513ef514 AndroidTestUtilities: fix cleanup operation
2017-01-11 09:58:34 -05:00
Brad King
34745595c3 Merge topic 'issue-16513-concrt140-dll'
3578e862 InstallRequiredSystemLibraries: Add concrt*.dll for VC >= 14.0
2017-01-11 09:58:31 -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
ff6a034e0b Merge topic 'FindOpenSSL-check-both'
696339a9 FindOpenSSL: Check that both CRYPTO and SSL libraries are present
2017-01-11 09:58:25 -05:00
Brad King
396e9378a8 Merge topic 'pgsql-yum'
5ffee691 FindPostgreSQL: automatically find installations from yum.postgresql.org
2017-01-11 09:58:22 -05:00
Brad King
a8b576244f Merge topic 'FindBoost-1.63'
a9b93501 FindBoost: Add support for 1.63
2017-01-11 09:58:17 -05:00
Brad King
1406408e61 Merge topic 'FindGTest-fixups'
8deb913d FindGTest: add lib search path for MSVC x64 platform
eadd395a FindGTest: Fix documented GTEST_MSVC_SEARCH default value
2017-01-11 09:58:14 -05:00
Brad King
22dfda1112 Merge topic 'FindBoost-find-default'
ff91b151 FindBoost: Search official location of prebuilt binaries on Windows
2017-01-11 09:58:11 -05:00
Brad King
3a97a3713a VS: Port Visual Studio Setup third-party header to older VS versions 2017-01-11 09:45:05 -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
Sebastian Holtermann
7db05f426e AUTOGEN: Release notes for SKIP_AUTOX 2017-01-11 09:25:48 -05:00
Sebastian Holtermann
6eabac26f5 AUTOGEN: Documentation update: cmake-qt, AUTOMOC, AUTOUIC, AUTORCC 2017-01-11 09:25:48 -05:00
Daniel Pfeifer
d6877e6c40 Don't include CMakeParseArguments
The cmake_parse_arguments command is builtin with version 3.5.
The CMakeParseArguments module is empty and exists for backwards
compatibility with CMake 3.4 and lower.

Remove the includes of CMakeParseArguments from CMake's modules.
The modules are always used with the current version of CMake.

Leave the includes in the tests, as the tests may be run with an older
version of CMake.
2017-01-11 13:14:57 +01:00
Konstantin Podsvirov
0315ab7a31 Add installation infix (empty by default) 2017-01-11 14:10:39 +03:00
Konstantin Podsvirov
6310f7c3a0 Add cpack_ifw_configure_file command 2017-01-11 13:56:45 +03:00
Kitware Robot
3e5fbbd6cd CMake Nightly Date Stamp 2017-01-11 00:01:06 -05:00
Alex Turbov
ff91b1514b FindBoost: Search official location of prebuilt binaries on Windows
Make it possible to find Boost in the default install path (`c:\boost`)
of an official prebuilt binaries installation even when `BOOST_ROOT`
has not been specified.
2017-01-10 14:21:53 -05:00
Florent Castelli
524f5ee186 Android: Set compiler target platform when compiling ASM with Clang
Closes: #16535
2017-01-10 14:12:46 -05:00
Matthew Woehlke
4b0c13a87f Tests: Add additional launcher tests
Modify the launcher test to also try to build two executables, having
respectively build and link errors. This is intended to test that
launchers are used when running compile and link commands, as well as
custom commands. (In particular, this should catch breakage such as that
fixed by ce71bd9505a.)
2017-01-10 13:48:59 -05:00
Harry Mallon
696339a9d5 FindOpenSSL: Check that both CRYPTO and SSL libraries are present
* Strawberry perl on Windows installs one that is found by the
  default finder

While at it, de-duplicate code setting `OPENSSL_LIBRARIES`.
2017-01-10 13:42:48 -05:00
Dong XiaoC
8deb913d98 FindGTest: add lib search path for MSVC x64 platform 2017-01-10 13:26:33 -05:00
Dong XiaoC
eadd395a13 FindGTest: Fix documented GTEST_MSVC_SEARCH default value
Documentation updates in commit v3.5.0-rc1~124^2~2 (FindGTest: Add
imported targets and update documentation, 2015-12-10) accidentally
changed the documented default to the wrong value.  Restore the
documentation to refer to the actual default used in the implementation.
2017-01-10 13:25:59 -05:00
Brad King
e9d3557ccc Merge branch 'FindBoost-1.63' into release 2017-01-10 13:15:58 -05:00
Roger Leigh
a9b93501d4 FindBoost: Add support for 1.63 2017-01-10 13:15:34 -05:00
Ruslan Baratov
513ef514e5 AndroidTestUtilities: fix cleanup operation
`su` is not available by default on all devices:

```
> adb shell "echo ls /data/local/tmp | su"
/system/bin/sh: su: not found
> echo $?
0
```

Also since `execute_adb_command` use `execute_process` under the hood
the pipeline (`|`) will not be treated as special symbol and will be
process just like one more command line argument for the `adb`.
2017-01-10 13:12:45 -05:00
Alexey Sokolov
b8968b4b39 UseSWIG: Automatically scan dependencies of SWIG files for Makefiles
Issue: #4147
2017-01-10 13:05:59 -05:00
Domen Vrankar
af77368ed3 CPack/RPM test for using custom binary spec file 2017-01-10 18:47:52 +01:00
Konstantin Podsvirov
3462118c6d Allow CodeBlocks for NMake Makefiles JOM 2017-01-10 19:26:21 +03:00
Martin Koegler
b1dc4ddbdd BundleUtilities: Maintain symlink structure
Closes: #15047
2017-01-10 10:55:41 -05: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
c046356a5c Merge branch 'pgsql-yum' into release 2017-01-10 09:53:26 -05:00
Rolf Eike Beer
5ffee691ee FindPostgreSQL: automatically find installations from yum.postgresql.org
In commit v3.3.0-rc1~4^2 (FindPostgreSQL: Search some more common
packaging locations) the PostgreSQL_ADDITIONAL_SEARCH_PATHS variable was
removed. This was used e.g. by osm2pgsql to be able to build on CentOS
with recent PostgreSQL versions. At least add those locations from
yum.postgresql.org, which is a more or less official location.
2017-01-10 09:52:42 -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
039a7df9ba Merge topic 'cpack-test-extra-std-out-err-file-overloads'
adbf7228 CPack test additional std out/err regex file overloads
2017-01-10 09:34:49 -05:00
Brad King
ea62999f45 Merge topic 'cpack-rpm-user-binary-spec-file-fix'
574c81e2 CPack/RPM fix - custom binary spec file handling
2017-01-10 09:34:46 -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
cbc07d331d AUTOGEN: Documentation for SKIP_AUTOX source file properties 2017-01-10 12:49:17 +01:00
Sebastian Holtermann
c17e0a3ad5 AUTOGEN: Tests: AUTORCC SKIP_AUTORCC and SKIP_AUTOGEN test 2017-01-10 12:49:17 +01:00
Sebastian Holtermann
53787bf8de AUTOGEN: Tests: AUTOUIC SKIP_AUTOUIC and SKIP_AUTOGEN test 2017-01-10 12:49:16 +01:00
Sebastian Holtermann
8dbdd3e726 AUTOGEN: Tests: AUTOMOC SKIP_AUTOMOC and SKIP_AUTOGEN test 2017-01-10 12:49:16 +01: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