summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* QtAutogen: Rename autogen target to *_autogen from *_automocSebastian Holtermann2016-12-074-7/+7
|
* QtAutogen: Inline single use variable definitionsSebastian Holtermann2016-12-071-8/+5
|
* QtAutogen: Determine the Qt major version in only one waySebastian Holtermann2016-12-071-45/+34
|
* QtAutogen: Clean removes autogen build directorySebastian Holtermann2016-12-071-5/+3
| | | | | Cleaning removes the entire autogen build directory instead of single files.
* QtAutogen: Generate included ui_ and moc_ files in _automoc/includesSebastian Holtermann2016-12-073-47/+66
| | | | | | | | | | ui_ and moc_ files that are include in source files get generated in $CURRENT_BUILD_DIR/$TARGETNAME_automoc/include. The directory is added to the INCLUDE_DIRECTORIES of the origin target in the generation stage. From now on all autogen files get generated below $CURRENT_BUILD_DIR/$TARGETNAME_automoc.
* cmGeneratorTarget: Add AddIncludeDirectory method (experimental)Sebastian Holtermann2016-12-072-0/+21
|
* QtAutogen: Use checksum based subdirectories to avoid name collisionsSebastian Holtermann2016-12-078-229/+205
|
* QtAutogen: Remove .dir suffix from automoc build directorySebastian Holtermann2016-12-072-2/+2
|
* QtAutogen: Generate moc compilation in _automoc.dir/moc_compilation.cppSebastian Holtermann2016-12-073-20/+20
|
* QtAutogen: Use upper case for MOC, UIC and RCC in messagesSebastian Holtermann2016-12-072-4/+4
|
* QtAutogen: New common bold logging methodSebastian Holtermann2016-12-072-16/+16
|
* QtAutogen: Make sure parent directory exists before writing filesSebastian Holtermann2016-12-072-37/+85
|
* QtAutogen: Improved error handlingSebastian Holtermann2016-12-072-18/+32
|
* QtAutogen: Error and warning log method tweaksSebastian Holtermann2016-12-072-15/+27
|
* QtAutogen: Improved error recognitionSebastian Holtermann2016-12-071-42/+48
|
* QtAutogen: Improved error recognition on config loadSebastian Holtermann2016-12-072-24/+40
|
* QtAutogen: CommentsSebastian Holtermann2016-12-061-0/+3
|
* QtAutogen: For loop feature test optimizationSebastian Holtermann2016-12-061-12/+11
|
* QtAutogen: Variable scope optimizationsSebastian Holtermann2016-12-061-34/+39
|
* QtAutogen: Rename variable templates in config templateSebastian Holtermann2016-12-062-10/+7
|
* QtAutogen: Make strings constSebastian Holtermann2016-12-061-2/+2
|
* QtAutogen: Rename config AM_RELAXED_MODE to AM_MOC_RELAXED_MODESebastian Holtermann2016-12-063-4/+4
|
* QtAutogen: Change config file permissions only on demandSebastian Holtermann2016-12-061-10/+15
|
* QtAutogen: Inline single use variableSebastian Holtermann2016-12-061-6/+2
|
* QtAutogen: Remove unused intermediate definition in makefileSebastian Holtermann2016-12-061-5/+1
|
* QtAutogen: Moc related variable renamedSebastian Holtermann2016-12-061-6/+6
|
* QtAutogen: Moc related variable renamedSebastian Holtermann2016-12-061-6/+6
|
* QtAutogen: Target directory name function renameSebastian Holtermann2016-12-061-3/+3
|
* QtAutogen: Move util functions to file beginSebastian Holtermann2016-12-061-20/+20
|
* QtAutogen: Moc related setup function renameSebastian Holtermann2016-12-061-2/+2
|
* QtAutogen: Uic related function renameSebastian Holtermann2016-12-061-3/+3
|
* QtAutogen: Uic related setup function renameSebastian Holtermann2016-12-061-2/+2
|
* QtAutogen: Rcc related function renameSebastian Holtermann2016-12-061-3/+3
|
* QtAutogen: Rcc related function renameSebastian Holtermann2016-12-061-2/+2
|
* QtAutogen: Rcc related list function renameSebastian Holtermann2016-12-061-9/+9
|
* QtAutogen: Rcc related setup function renameSebastian Holtermann2016-12-061-2/+2
|
* QtAutogen: Remove and inline ReadAll functionSebastian Holtermann2016-12-061-10/+7
| | | | The function was only used once.
* QtAutogen: Use shorter name for static functionSebastian Holtermann2016-12-061-3/+3
|
* QtAutogen: Use util prefix for static function nameSebastian Holtermann2016-12-061-4/+4
|
* Merge topic 'FindOpenGL-imported-targets'Brad King2016-12-066-0/+109
|\ | | | | | | | | 027ce359 FindOpenGL: Provide imported targets for GL and GLU
| * FindOpenGL: Provide imported targets for GL and GLUBrad King2016-12-026-0/+109
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Create OpenGL::GL and OpenGL::GLU imported targets using the locations found. This feature was originally added by commit v3.1.0-rc1~420^2~2 (FindOpenGL: Provide imported targets for GL and GLU, 2014-05-31) but had to be reverted by commit v3.1.0-rc3~10^2 (FindOpenGL: Revert support for imported targets, 2014-12-01) due to issue #15267. Since then we added support for `IMPORTED_LIBNAME` to interface libraries, so use it to handle the case where we have only the library name without an absolute path. Inspired-by: Philipp Möller <bootsarehax@googlemail.com> Closes: #15267
* | Merge topic 'update-curl'Brad King2016-12-06107-1519/+2090
|\ \ | | | | | | | | | | | | | | | | | | | | | df7fa47c curl: Disable symbol hiding logic in build for CMake f8a1ba20 Merge branch 'upstream-curl' into update-curl 93cc249f curl 2016-11-02 (3c561c65) 25d7b1ca curl: Update script to get curl 7.51.0
| * | curl: Disable symbol hiding logic in build for CMakeBrad King2016-12-061-0/+2
| | | | | | | | | | | | | | | We already disable the code using `HIDES_CURL_PRIVATE_SYMBOLS`, so skip the code to set it too, thus avoiding unnecessary `message()` calls.
| * | Merge branch 'upstream-curl' into update-curlBrad King2016-12-05106-1518/+2087
| |\ \ | | | | | | | | | | | | | | | | * upstream-curl: curl 2016-11-02 (3c561c65)
| | * | curl 2016-11-02 (3c561c65)Curl Upstream2016-12-05106-1520/+2096
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Code extracted from: https://github.com/curl/curl.git at commit 3c561c657c2f0e553b19115a506592a8bbd744bc (curl-7_51_0).
| * | | curl: Update script to get curl 7.51.0Brad King2016-12-051-1/+1
| | | |
* | | | Merge topic 'update-kwsys'Brad King2016-12-068-103/+198
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | 7f307d9e Merge branch 'upstream-KWSys' into update-kwsys 1b50bd3f KWSys 2016-12-02 (4967ccc0)
| * \ \ \ Merge branch 'upstream-KWSys' into update-kwsysBrad King2016-12-058-103/+198
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * upstream-KWSys: KWSys 2016-12-02 (4967ccc0)
| | * | | | KWSys 2016-12-02 (4967ccc0)KWSys Upstream2016-12-058-103/+198
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Code extracted from: http://public.kitware.com/KWSys.git at commit 4967ccc054d268c430e73445f3a103e737c5f5f7 (master). Upstream Shortlog ----------------- Chuck Atkins (2): f1afce25 DynamicLoader: Re-organize preprocessor checks to use if, elif, else d94f92f7 DynamicLoader: Expand noop implementation to more platforms Dāvis Mosāns (2): f069db91 Encoding: Fix conversion of strings that contain null bytes 4967ccc0 ConsoleBuf: Fix output for strings that contain null byte
* | | | | | Merge topic 'wix-reg-install-dir'Brad King2016-12-062-1/+18
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4beaa926 Help: Add notes for topic 'wix-reg-install-dir' 1b91e010 Utilities/Release: Store WiX CMake install location in Windows registry