summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'Autogen_Simplify'Brad King2017-01-1137-458/+782
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 ...
| * AUTOGEN: Release notes for SKIP_AUTOXSebastian Holtermann2017-01-111-0/+12
| |
| * AUTOGEN: Documentation update: cmake-qt, AUTOMOC, AUTOUIC, AUTORCCSebastian Holtermann2017-01-114-0/+18
| |
| * AUTOGEN: Documentation for SKIP_AUTOX source file propertiesSebastian Holtermann2017-01-105-0/+30
| |
| * AUTOGEN: Tests: AUTORCC SKIP_AUTORCC and SKIP_AUTOGEN testSebastian Holtermann2017-01-105-0/+46
| |
| * AUTOGEN: Tests: AUTOUIC SKIP_AUTOUIC and SKIP_AUTOGEN testSebastian Holtermann2017-01-1012-0/+147
| |
| * AUTOGEN: Tests: AUTOMOC SKIP_AUTOMOC and SKIP_AUTOGEN testSebastian Holtermann2017-01-108-0/+90
| |
| * AUTOGEN: Generators: Do moc/uic skip test during file list generationSebastian Holtermann2017-01-101-15/+16
| |
| * AUTOGEN: Generators: Message upper/lower case unificationSebastian Holtermann2017-01-101-23/+23
| |
| * AUTOGEN: Generators: Use single moc/uic skip test method onlySebastian Holtermann2017-01-101-50/+42
| |
| * AUTOGEN: Generators: Use AUTOMOC/UIC/RCC instead of AUTOGEN in messagesSebastian Holtermann2017-01-101-8/+8
| |
| * AUTOGEN: Generators: Moc/UicSkipTest methodsSebastian Holtermann2017-01-102-28/+38
| |
| * AUTOGEN: Generators: Use separate header lists for MOC and UICSebastian Holtermann2017-01-102-16/+50
| | | | | | | | This is necessary for the skipMoc and skipUic lists to work properly.
| * AUTOGEN: Generators: Be verbose about skipping filesSebastian Holtermann2017-01-101-18/+43
| |
| * AUTOGEN: Generators: Remove unused variableSebastian Holtermann2017-01-101-3/+2
| |
| * AUTOGEN: Initializer: Always remember skipped filesSebastian Holtermann2017-01-101-26/+35
| |
| * AUTOGEN: Initializer: Enable SKIP_AUTOGEN on all AUTOGEN generated sourcesSebastian Holtermann2017-01-101-2/+4
| |
| * AUTOGEN: Initializer: Introduce SKIP_AUTOGEN checksSebastian Holtermann2017-01-101-1/+7
| |
| * AUTOGEN: Rename config variablesSebastian Holtermann2017-01-102-20/+20
| | | | | | | | The new names describe the variables use cases better.
| * AUTOGEN: Make skipMoc and skipUic blacklists behave the same waySebastian Holtermann2017-01-102-80/+82
| | | | | | | | | | | | | | 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.
| * AUTOGEN: Generators: Add dedicated method for moc content parsingSebastian Holtermann2017-01-102-62/+80
| |
| * AUTOGEN: Generators: Split config SKIP_MOC and SKIP_UIC into vectorsSebastian Holtermann2017-01-102-22/+18
| |
| * AUTOGEN: Generators: Split config headers/sources into vectorSebastian Holtermann2017-01-102-15/+12
| |
| * AUTOGEN: Generators: Rename ParseForUic methodSebastian Holtermann2017-01-102-5/+5
| |
| * AUTOGEN: Generators: Group static function definitionsSebastian Holtermann2017-01-101-9/+9
| |
| * AUTOGEN: Generators: Use precompiled regular expressionsSebastian Holtermann2017-01-102-38/+43
| |
| * AUTOGEN: Generators: Use unified ParseSourceFile and drop old methodsSebastian Holtermann2017-01-102-325/+5
| |
| * AUTOGEN: Generators: Introduce unified ParseSourceFileSebastian Holtermann2017-01-102-0/+214
| | | | | | | | | | | | | | 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.
| * AUTOGEN: Generators: CommentsSebastian Holtermann2017-01-101-1/+1
| |
| * AUTOGEN: Generators: Variable renameSebastian Holtermann2017-01-101-2/+2
| |
| * AUTOGEN: Generators: Cleanup and optimize ParseForUic methodSebastian Holtermann2017-01-101-13/+7
| |
| * AUTOGEN: Generators: Cleanup variable initializationSebastian Holtermann2017-01-101-4/+1
| |
| * AUTOGEN: Generators: rename makeParentDirectory to MakeParentDirectorySebastian Holtermann2017-01-102-6/+6
| |
* | Merge topic 'android_clang_asm'Brad King2017-01-112-1/+5
|\ \ | | | | | | | | | | | | 524f5ee1 Android: Set compiler target platform when compiling ASM with Clang
| * | Android: Set compiler target platform when compiling ASM with ClangFlorent Castelli2017-01-102-1/+5
| | | | | | | | | | | | Closes: #16535
* | | Merge topic 'AndroidTestUtilities-fix-cleanup'Brad King2017-01-111-1/+1
|\ \ \ | | | | | | | | | | | | | | | | 513ef514 AndroidTestUtilities: fix cleanup operation
| * | | AndroidTestUtilities: fix cleanup operationRuslan Baratov2017-01-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `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`.
* | | | Merge topic 'issue-16513-concrt140-dll'Brad King2017-01-111-2/+8
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 3578e862 InstallRequiredSystemLibraries: Add concrt*.dll for VC >= 14.0
| * | | | InstallRequiredSystemLibraries: Add concrt*.dll for VC >= 14.0Taylor Braun-Jones2016-12-161-2/+8
| | | | | | | | | | | | | | | | | | | | Fixes #16513
* | | | | Merge topic 'SublimeText-no-VERBOSE'Brad King2017-01-112-9/+9
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 154def30 Sublime: Do not build with verbose output
| * | | | | Sublime: Do not build with verbose outputRichard Collins2017-01-102-9/+9
| |/ / / / | | | | | | | | | | | | | | | Remove the hard-coded use of `make VERBOSE=1` and `ninja -v`.
* | | | | Merge topic 'FindOpenSSL-check-both'Brad King2017-01-111-7/+6
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 696339a9 FindOpenSSL: Check that both CRYPTO and SSL libraries are present
| * | | | | FindOpenSSL: Check that both CRYPTO and SSL libraries are presentHarry Mallon2017-01-101-7/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Strawberry perl on Windows installs one that is found by the default finder While at it, de-duplicate code setting `OPENSSL_LIBRARIES`.
* | | | | | Merge topic 'pgsql-yum'Brad King2017-01-111-1/+6
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5ffee691 FindPostgreSQL: automatically find installations from yum.postgresql.org
| * | | | | | FindPostgreSQL: automatically find installations from yum.postgresql.orgRolf Eike Beer2017-01-101-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | | | Merge topic 'FindBoost-1.63'Brad King2017-01-111-1/+16
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a9b93501 FindBoost: Add support for 1.63
| * | | | | | | FindBoost: Add support for 1.63Roger Leigh2017-01-101-1/+16
| |/ / / / / /
* | | | | | | Merge topic 'FindGTest-fixups'Brad King2017-01-111-4/+10
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8deb913d FindGTest: add lib search path for MSVC x64 platform eadd395a FindGTest: Fix documented GTEST_MSVC_SEARCH default value
| * | | | | | | FindGTest: add lib search path for MSVC x64 platformDong XiaoC2017-01-101-2/+8
| | | | | | | |
| * | | | | | | FindGTest: Fix documented GTEST_MSVC_SEARCH default valueDong XiaoC2017-01-101-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.