summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
| * | | | | | Help: Add notes for topic 'wix-reg-install-dir'Brad King2016-12-061-0/+6
| | | | | | |
| * | | | | | Utilities/Release: Store WiX CMake install location in Windows registryNils Gladitz2016-12-051-1/+12
| | | | | | |
* | | | | | | CMake Nightly Date StampKitware Robot2016-12-061-1/+1
| |_|_|/ / / |/| | | | |
* | | | | | Merge topic 'features-c++17'Brad King2016-12-0523-29/+109
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 97c1e569 Help: Add release note for C++ 17 support 85c8e652 Features: Activate C++ 17 support for AppleClang 6.1+ 8084f7a6 Features: Activate C++ 17 support for Clang 3.5+ 24e29d41 Features: Activate C++ 17 support for GNU 5.1+ ae1a6815 Features: Add infrastructure for C++ 17 language standard 684e4d20 Features: Make feature recording conditions more consistent
| * | | | | Help: Add release note for C++ 17 supportBrad King2016-12-021-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | Closes: #16468
| * | | | | Features: Activate C++ 17 support for AppleClang 6.1+Brad King2016-12-021-0/+8
| | | | | |
| * | | | | Features: Activate C++ 17 support for Clang 3.5+Brad King2016-12-021-0/+8
| | | | | |
| * | | | | Features: Activate C++ 17 support for GNU 5.1+Brad King2016-12-021-0/+8
| | | | | |
| * | | | | Features: Add infrastructure for C++ 17 language standardBrad King2016-12-0213-13/+55
| | | | | | | | | | | | | | | | | | | | | | | | Issue: #16468
| * | | | | Features: Make feature recording conditions more consistentBrad King2016-12-029-16/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Condition all calls to `_record_compiler_features_{c,cxx}` on `_result EQUAL 0` so that adding new language standards later does not need to update them. Avoid some duplicate compiler version checks by conditioning C11 and CXX14 feature recording on the existence of `CMAKE_{C11,CXX14}_STANDARD_COMPILE_OPTION` (whose setting already used the version check).
* | | | | | Merge topic 'test-handler-multimap'Brad King2016-12-051-27/+20
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1af67b19 cmCTestTestHandler: use multimap
| * | | | | | cmCTestTestHandler: use multimapDaniel Pfeifer2016-12-031-27/+20
| | |/ / / / | |/| | | |
* | | | | | Merge topic 'cpack-rpm-user-file-list-with-multiple-directives'Brad King2016-12-056-5/+42
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4e4b786e CPack/RPM CPACK_RPM_USER_FILELIST change release note a5a6f61b CPackRPM now supports multiple directives in CPACK_RPM_USER_FILELIST
| * | | | | | CPack/RPM CPACK_RPM_USER_FILELIST change release noteDomen Vrankar2016-12-031-0/+6
| | | | | | |
| * | | | | | CPackRPM now supports multiple directives in CPACK_RPM_USER_FILELISTHarry Mallon2016-12-035-5/+36
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * In older version "%dir %attr(-, root, root) foo" would put "%dir foo" in the final spec file. * Also added comment to describe this and advise not not to add trailing slashes to directories in USER_FILELIST. * Includes test in RunCMake CPack which now passes.
* | | | | | Merge topic 'src-COMPILE_FLAGS-genex'Brad King2016-12-051-1/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5dec0a23 server-mode: Fix per-source COMPILE_FLAGS genex evaluation
| * | | | | | server-mode: Fix per-source COMPILE_FLAGS genex evaluationTobias Hunger2016-12-021-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Logic added by commit 1e4bb358 (Add generator expression support to per-source COMPILE_FLAGS, 2016-10-25) accidentally frees memory before finishing with it. Revise the logic to hold the memory long enough.
* | | | | | | Merge topic 'asm-splitting'Brad King2016-12-051-1/+7
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | dd153de4 CMakeDetermineASMCompiler: arg-split ASM* env var like CC
| * | | | | | | CMakeDetermineASMCompiler: arg-split ASM* env var like CCMichał Górny2016-12-021-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Split the arguments off of the `ASM${ASM_DIALECT}` environment variable as is done for `CC` and other compiler variables. This fixes using CMake when `ASM*` is used to pass additional target flags, e.g. when one uses `ASM=${CC}`.
* | | | | | | | CMake Nightly Date StampKitware Robot2016-12-051-1/+1
| | | | | | | |
* | | | | | | | CMake Nightly Date StampKitware Robot2016-12-041-1/+1
| |_|/ / / / / |/| | | | | |
* | | | | | | CMake Nightly Date StampKitware Robot2016-12-031-1/+1
| |_|_|_|_|/ |/| | | | |
* | | | | | Merge topic 'cmake-gui-T-help'Brad King2016-12-021-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | dde72ee9 cmake-gui: Clarify help string on toolset selection field
| * | | | | | cmake-gui: Clarify help string on toolset selection fieldBrad King2016-12-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The text `-T parameter` may be read as an example value for the field, but the `-T` part should not be included. Clarify the wording. Closes: #16475