summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Help: Improve formatting of variable documentationJames Johnston2015-08-21194-508/+537
| | | | | | | | Improve formatting, primarily by: * Adding links to relevant commands, properties, generators, and so on. * Converting code, symbols, paths, and so on to fixed-width fonts. * Hard wrapping lines to 80 characters or less.
* CMake Nightly Date StampKitware Robot2015-08-191-1/+1
|
* Merge topic 'finpkgconfig-if-deref'Brad King2015-08-181-1/+1
|\ | | | | | | | | b9ec9392 FindPkgConfig: remove variable dereference
| * FindPkgConfig: remove variable dereferenceRolf Eike Beer2015-08-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If CMAKE_MINIMUM_REQUIRED_VERSION is not set because no cmake_minimum_required() call is present this line can lead to an error as that string is empty so too few arguments are passed to if(): See also "/var/tmp/paludis/build/kde-krdc-15.08.0/work/build/CMakeFiles/CMakeOutput.log". See also "/var/tmp/paludis/build/kde-krdc-15.08.0/work/build/CMakeFiles/CMakeError.log". CMake Error at /usr/share/cmake/Modules/FindPkgConfig.cmake:112 (elseif): given arguments: "VERSION_LESS" "3.1" Unknown arguments specified Call Stack (most recent call first): /usr/share/cmake/Modules/FindPkgConfig.cmake:501 (_pkgconfig_parse_options) /usr/share/cmake/Modules/FindOpenSSL.cmake:43 (pkg_check_modules)
* | Merge topic 'add-ARTOS-platform-module'Brad King2015-08-182-0/+26
|\ \ | | | | | | | | | | | | 462fbd1e Add support for ARTOS platform using GNU C with ac compiler driver
| * | Add support for ARTOS platform using GNU C with ac compiler driverKars de Jong2015-08-172-0/+26
| | | | | | | | | | | | | | | | | | Add platform and compiler descriptions for ARTOS RTOS (locamation.com). Signed-off-by: Kars de Jong <kars.dejong@locamation.nl>
* | | Merge topic 'cmake-gui-high-resolution'Brad King2015-08-181-0/+2
|\ \ \ | | | | | | | | | | | | | | | | a41ebd4e cmake-gui: Add support for HiDPI (Retina) screens on OS X
| * | | cmake-gui: Add support for HiDPI (Retina) screens on OS XFrancois Best2015-08-171-0/+2
| | | |
* | | | Merge topic 'build-subdir'Brad King2015-08-181-0/+19
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | ba1065ab cmake: Add support for "--build ." in subdirectory (#15696)
| * | | cmake: Add support for "--build ." in subdirectory (#15696)Clinton Stimpson2015-08-151-0/+19
| | | |
* | | | CMake Nightly Date StampKitware Robot2015-08-181-1/+1
| |_|/ |/| |
* | | Merge topic 'propagate-link-search-to-try_compile'Brad King2015-08-175-8/+32
|\ \ \ | | | | | | | | | | | | | | | | | | | | 7f0b83e0 try_compile: Update documentation for other propagated variables fb77c2c5 try_compile: Propogate the CMAKE_LINK_SEARCH_ variables
| * | | try_compile: Update documentation for other propagated variablesChuck Atkins2015-08-142-4/+9
| | | |
| * | | try_compile: Propogate the CMAKE_LINK_SEARCH_ variablesChuck Atkins2015-08-144-4/+23
| |/ /
* | | Merge topic 'extended-length-paths'Brad King2015-08-171-8/+11
|\ \ \ | | | | | | | | | | | | | | | | e06ea837 cmSystemTools: Use extended length paths for Windows apis.
| * | | cmSystemTools: Use extended length paths for Windows apis.Clinton Stimpson2015-08-151-8/+11
| |/ /
* | | Merge topic 'emacs-mode-font-lock'Brad King2015-08-171-2/+2
|\ \ \ | | | | | | | | | | | | | | | | | | | | 64e6bc5c cmake-mode.el: Refine variable font-lock 758664b7 cmake-mode.el: Fix function name font-lock
| * | | cmake-mode.el: Refine variable font-lockRoy Crihfield2015-08-141-1/+1
| | | | | | | | | | | | | | | | | | | | Simplify regexp for variable names, and allow more legal characters. Remove `$ *` as legal chars, and allow `- + / .` in names.
| * | | cmake-mode.el: Fix function name font-lockRoy Crihfield2015-08-131-1/+1
| | | | | | | | | | | | | | | | Allow space separating name and opening parenthesis.
* | | | Merge topic 'FindBoost-1.59'Brad King2015-08-171-2/+4
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | ff5bb2ef FindBoost: Add support for Boost 1.59
| * | | | FindBoost: Add support for Boost 1.59Roger Leigh2015-08-141-2/+4
| | |/ / | |/| |
* | | | Merge topic 'FindXercesC-updates'Brad King2015-08-172-4/+17
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | db292564 FindXercesC: Add support for 3D_1 variant of the library 021bf871 FindXercesC: Find debug and release libraries separately
| * | | | FindXercesC: Add support for 3D_1 variant of the libraryRoger Leigh2015-08-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This version is generated by the Windows Visual Studio project files for unknown reasons, but is required to pick up the debug version of the library created by current versions of Xerces-C.
| * | | | FindXercesC: Find debug and release libraries separatelyRoger Leigh2015-08-142-4/+17
| |/ / /
* | | | Merge topic 'FindTIFF-updates'Brad King2015-08-172-1/+18
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 724fa682 FindTIFF: Find debug and release libraries separately
| * | | | FindTIFF: Find debug and release libraries separatelyRoger Leigh2015-08-142-1/+18
| |/ / /
* | | | Merge topic 'update-curl'Brad King2015-08-17183-11425/+14831
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4071a747 curl: Update README-CMake.txt for new snapshot 7727d485 curl: Update configuration of build within CMake 3f2f1a94 curl: Fix check for gethostbyname_r with 5 arguments 91e8d35a Merge branch 'curl-upstream' into update-curl 602cdc06 cmCurl: Tolerate lack of CURLOPT_CAPATH support 70654261 curl 7.44.0 (reduced)
| * | | | curl: Update README-CMake.txt for new snapshotBrad King2015-08-171-4/+4
| | | | |
| * | | | curl: Update configuration of build within CMakeBrad King2015-08-171-4/+11
| | | | | | | | | | | | | | | | | | | | | | | | | Update our curl build option settings as needed for CMake to account for differences in curl options from 7.38 to 7.44.
| * | | | curl: Fix check for gethostbyname_r with 5 argumentsBrad King2015-08-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix the check code to pass 5 arguments instead of 6. This typo was introduced in curl 7.39 but was not noticed because the result of this check is used only if ENABLE_IPV6 is OFF.
| * | | | Merge branch 'curl-upstream' into update-curlBrad King2015-08-12181-11416/+14815
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve conflicts by taking upstream side when possible and otherwise integrating the changes from both sides. Be carful in CMakeLists.txt where the OPENSSL code block that we modified previously has moved, and preserve our previous modifications in the new location.
| | * | | | curl 7.44.0 (reduced)Curl Upstream2015-08-12181-11390/+14792
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extract upstream curl using the following shell code. url=git://github.com/bagder/curl.git && v=7.44.0 && r=1a7f66a3 && paths=" CMake/* CMakeLists.txt COPYING include/curl/*.h include/curl/curlbuild.h.cmake lib/*.c lib/*.h lib/CMakeLists.txt lib/Makefile.inc lib/curl_config.h.cmake lib/libcurl.rc lib/vtls/*.c lib/vtls/*.h " && mkdir curl-$v-g$r-reduced && git clone $url curl-git && date=$(cd curl-git && git log -n 1 --format='%cd' $r) && (cd curl-git && git checkout $r && git archive --format=tar $r -- $paths) | (cd curl-$v-g$r-reduced && tar xv && rm lib/config-*.h) && echo "g$r date: $date"
| * | | | | cmCurl: Tolerate lack of CURLOPT_CAPATH supportBrad King2015-08-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since curl 7.39 the CURLOPT_CAPATH setting may be rejected with a CURLE_NOT_BUILT_IN error. Simply tolerate this with silent failure since we just will not use the CAPATH setting in this case.
* | | | | | Merge topic 'compiler-id-ancient-gcc-version'Brad King2015-08-171-1/+3
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6699834d GNU-DetermineCompiler: Add support for very old versions of GCC
| * | | | | | GNU-DetermineCompiler: Add support for very old versions of GCCKars de Jong2015-08-131-1/+3
| | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Very old versions of gcc (2.3.1) do not define __GNUC_MINOR__. Signed-off-by: Kars de Jong <kars.dejong@locamation.nl>
* | | | | | Merge topic 'FindOpenSSL-imported-targets'Brad King2015-08-175-12/+138
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 75e3a8e8 FindOpenSSL: Provide imported targets OpenSSL::{SSL,Crypto} 79a36437 FindOpenSSL: Revise and format module documentation
| * | | | | | FindOpenSSL: Provide imported targets OpenSSL::{SSL,Crypto}Konstantin Podsvirov2015-08-135-0/+122
| | | | | | |
| * | | | | | FindOpenSSL: Revise and format module documentationBrad King2015-08-131-15/+19
| |/ / / / / | | | | | | | | | | | | | | | | | | Improve reStructuredText formatting and add section headers.
* | | | | | Merge topic 'use-generator-target'Brad King2015-08-173-1/+12
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | 9b449e9c cmComputeLinkInformation: Lookup a target only if we have one
| * | | | | cmComputeLinkInformation: Lookup a target only if we have oneBrad King2015-08-133-1/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The change in commit 27252b24 (cmComputeLinkInformation: Simplify generator object access, 2015-08-02) broke the conditional use of a target introduced in commit 41abdc17 (cmGeneratorTarget: Move GetSOName from cmTarget, 2015-08-04). Restore the conditional lookup. Add a test case that hacks platform information variables to trigger this code everywhere.
* | | | | | CMake Nightly Date StampKitware Robot2015-08-171-1/+1
| | | | | |
* | | | | | CMake Nightly Date StampKitware Robot2015-08-161-1/+1
| | | | | |
* | | | | | CMake Nightly Date StampKitware Robot2015-08-151-1/+1
| |_|_|_|/ |/| | | |
* | | | | CMake Nightly Date StampKitware Robot2015-08-141-1/+1
| | | | |
* | | | | Merge branch 'release'Brad King2015-08-130-0/+0
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | CMake 3.3.1v3.3.1Brad King2015-08-131-1/+1
| | | | |
* | | | | Merge topic 'add-link-search-static-properties-defaults'Brad King2015-08-131-0/+9
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 970a741f Help: Add notes for topic 'add-link-search-static-properties-defaults'
| * | | | | Help: Add notes for topic 'add-link-search-static-properties-defaults'Brad King2015-08-131-0/+9
| | | | | |
* | | | | | Merge topic 'OUTPUT_DIRECTORY-genex'Brad King2015-08-1314-10/+119
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d25819bc Add generator expression support to OUTPUT_DIRECTORY target properties e36a05fd cmTarget: Detect and diagnose recursion in GetOutputInfo
| * | | | | | Add generator expression support to OUTPUT_DIRECTORY target propertiesRobert Goulet2015-08-1214-7/+98
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If {ARCHIVE,LIBRARY,RUNTIME}_OUTPUT_DIRECTORY is set with a genex then do not add the per-config subdirectory on multi-config generators. This will allow projects to use $<CONFIG> to place the per-config part of the directory path somewhere other than the end.