Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge topic 'Autogen_Simplify' | Brad King | 2017-01-11 | 37 | -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_AUTOX | Sebastian Holtermann | 2017-01-11 | 1 | -0/+12 |
| | | |||||
| * | AUTOGEN: Documentation update: cmake-qt, AUTOMOC, AUTOUIC, AUTORCC | Sebastian Holtermann | 2017-01-11 | 4 | -0/+18 |
| | | |||||
| * | AUTOGEN: Documentation for SKIP_AUTOX source file properties | Sebastian Holtermann | 2017-01-10 | 5 | -0/+30 |
| | | |||||
| * | AUTOGEN: Tests: AUTORCC SKIP_AUTORCC and SKIP_AUTOGEN test | Sebastian Holtermann | 2017-01-10 | 5 | -0/+46 |
| | | |||||
| * | AUTOGEN: Tests: AUTOUIC SKIP_AUTOUIC and SKIP_AUTOGEN test | Sebastian Holtermann | 2017-01-10 | 12 | -0/+147 |
| | | |||||
| * | AUTOGEN: Tests: AUTOMOC SKIP_AUTOMOC and SKIP_AUTOGEN test | Sebastian Holtermann | 2017-01-10 | 8 | -0/+90 |
| | | |||||
| * | AUTOGEN: Generators: Do moc/uic skip test during file list generation | Sebastian Holtermann | 2017-01-10 | 1 | -15/+16 |
| | | |||||
| * | AUTOGEN: Generators: Message upper/lower case unification | Sebastian Holtermann | 2017-01-10 | 1 | -23/+23 |
| | | |||||
| * | AUTOGEN: Generators: Use single moc/uic skip test method only | Sebastian Holtermann | 2017-01-10 | 1 | -50/+42 |
| | | |||||
| * | AUTOGEN: Generators: Use AUTOMOC/UIC/RCC instead of AUTOGEN in messages | Sebastian Holtermann | 2017-01-10 | 1 | -8/+8 |
| | | |||||
| * | AUTOGEN: Generators: Moc/UicSkipTest methods | Sebastian Holtermann | 2017-01-10 | 2 | -28/+38 |
| | | |||||
| * | AUTOGEN: Generators: Use separate header lists for MOC and UIC | Sebastian Holtermann | 2017-01-10 | 2 | -16/+50 |
| | | | | | | | | This is necessary for the skipMoc and skipUic lists to work properly. | ||||
| * | AUTOGEN: Generators: Be verbose about skipping files | Sebastian Holtermann | 2017-01-10 | 1 | -18/+43 |
| | | |||||
| * | AUTOGEN: Generators: Remove unused variable | Sebastian Holtermann | 2017-01-10 | 1 | -3/+2 |
| | | |||||
| * | AUTOGEN: Initializer: Always remember skipped files | Sebastian Holtermann | 2017-01-10 | 1 | -26/+35 |
| | | |||||
| * | AUTOGEN: Initializer: Enable SKIP_AUTOGEN on all AUTOGEN generated sources | Sebastian Holtermann | 2017-01-10 | 1 | -2/+4 |
| | | |||||
| * | AUTOGEN: Initializer: Introduce SKIP_AUTOGEN checks | Sebastian Holtermann | 2017-01-10 | 1 | -1/+7 |
| | | |||||
| * | AUTOGEN: Rename config variables | Sebastian Holtermann | 2017-01-10 | 2 | -20/+20 |
| | | | | | | | | The new names describe the variables use cases better. | ||||
| * | AUTOGEN: Make skipMoc and skipUic blacklists behave the same way | Sebastian Holtermann | 2017-01-10 | 2 | -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 parsing | Sebastian Holtermann | 2017-01-10 | 2 | -62/+80 |
| | | |||||
| * | AUTOGEN: Generators: Split config SKIP_MOC and SKIP_UIC into vectors | Sebastian Holtermann | 2017-01-10 | 2 | -22/+18 |
| | | |||||
| * | AUTOGEN: Generators: Split config headers/sources into vector | Sebastian Holtermann | 2017-01-10 | 2 | -15/+12 |
| | | |||||
| * | AUTOGEN: Generators: Rename ParseForUic method | Sebastian Holtermann | 2017-01-10 | 2 | -5/+5 |
| | | |||||
| * | AUTOGEN: Generators: Group static function definitions | Sebastian Holtermann | 2017-01-10 | 1 | -9/+9 |
| | | |||||
| * | AUTOGEN: Generators: Use precompiled regular expressions | Sebastian Holtermann | 2017-01-10 | 2 | -38/+43 |
| | | |||||
| * | AUTOGEN: Generators: Use unified ParseSourceFile and drop old methods | Sebastian Holtermann | 2017-01-10 | 2 | -325/+5 |
| | | |||||
| * | AUTOGEN: Generators: Introduce unified ParseSourceFile | Sebastian Holtermann | 2017-01-10 | 2 | -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: Comments | Sebastian Holtermann | 2017-01-10 | 1 | -1/+1 |
| | | |||||
| * | AUTOGEN: Generators: Variable rename | Sebastian Holtermann | 2017-01-10 | 1 | -2/+2 |
| | | |||||
| * | AUTOGEN: Generators: Cleanup and optimize ParseForUic method | Sebastian Holtermann | 2017-01-10 | 1 | -13/+7 |
| | | |||||
| * | AUTOGEN: Generators: Cleanup variable initialization | Sebastian Holtermann | 2017-01-10 | 1 | -4/+1 |
| | | |||||
| * | AUTOGEN: Generators: rename makeParentDirectory to MakeParentDirectory | Sebastian Holtermann | 2017-01-10 | 2 | -6/+6 |
| | | |||||
* | | Merge topic 'android_clang_asm' | Brad King | 2017-01-11 | 2 | -1/+5 |
|\ \ | | | | | | | | | | | | | 524f5ee1 Android: Set compiler target platform when compiling ASM with Clang | ||||
| * | | Android: Set compiler target platform when compiling ASM with Clang | Florent Castelli | 2017-01-10 | 2 | -1/+5 |
| | | | | | | | | | | | | Closes: #16535 | ||||
* | | | Merge topic 'AndroidTestUtilities-fix-cleanup' | Brad King | 2017-01-11 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | | | | | | | | | 513ef514 AndroidTestUtilities: fix cleanup operation | ||||
| * | | | AndroidTestUtilities: fix cleanup operation | Ruslan Baratov | 2017-01-10 | 1 | -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 King | 2017-01-11 | 1 | -2/+8 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | 3578e862 InstallRequiredSystemLibraries: Add concrt*.dll for VC >= 14.0 | ||||
| * | | | | InstallRequiredSystemLibraries: Add concrt*.dll for VC >= 14.0 | Taylor Braun-Jones | 2016-12-16 | 1 | -2/+8 |
| | | | | | | | | | | | | | | | | | | | | Fixes #16513 | ||||
* | | | | | Merge topic 'SublimeText-no-VERBOSE' | Brad King | 2017-01-11 | 2 | -9/+9 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | 154def30 Sublime: Do not build with verbose output | ||||
| * | | | | | Sublime: Do not build with verbose output | Richard Collins | 2017-01-10 | 2 | -9/+9 |
| |/ / / / | | | | | | | | | | | | | | | | Remove the hard-coded use of `make VERBOSE=1` and `ninja -v`. | ||||
* | | | | | Merge topic 'FindOpenSSL-check-both' | Brad King | 2017-01-11 | 1 | -7/+6 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | 696339a9 FindOpenSSL: Check that both CRYPTO and SSL libraries are present | ||||
| * | | | | | FindOpenSSL: Check that both CRYPTO and SSL libraries are present | Harry Mallon | 2017-01-10 | 1 | -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 King | 2017-01-11 | 1 | -1/+6 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5ffee691 FindPostgreSQL: automatically find installations from yum.postgresql.org | ||||
| * | | | | | | FindPostgreSQL: automatically find installations from yum.postgresql.org | Rolf Eike Beer | 2017-01-10 | 1 | -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 King | 2017-01-11 | 1 | -1/+16 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a9b93501 FindBoost: Add support for 1.63 | ||||
| * | | | | | | | FindBoost: Add support for 1.63 | Roger Leigh | 2017-01-10 | 1 | -1/+16 |
| |/ / / / / / | |||||
* | | | | | | | Merge topic 'FindGTest-fixups' | Brad King | 2017-01-11 | 1 | -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 platform | Dong XiaoC | 2017-01-10 | 1 | -2/+8 |
| | | | | | | | | |||||
| * | | | | | | | FindGTest: Fix documented GTEST_MSVC_SEARCH default value | Dong XiaoC | 2017-01-10 | 1 | -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. |