summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* cmTestGenerator: Require cmLocalGenerator, not cmMakefile.Stephen Kelly2015-08-233-5/+19
|
* cmInstallFilesGenerator: Require cmLocalGenerator, not cmMakefile.Stephen Kelly2015-08-235-13/+17
|
* CMake Nightly Date StampKitware Robot2015-08-221-1/+1
|
* Merge topic 'improve-variable-help-formatting'Brad King2015-08-21194-508/+537
|\ | | | | | | | | 3bb707f0 Help: Improve formatting of variable documentation
| * 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.
* | Merge topic 'modules-no-soname'Brad King2015-08-2111-36/+93
|\ \ | | | | | | | | | | | | | | | f799ffb5 Do not set SONAME for MODULE library targets (#15705) 899458ab Tests: Cover NO_SONAME property for SHARED libraries
| * | Do not set SONAME for MODULE library targets (#15705)Felix Geyer2015-08-206-36/+23
| | | | | | | | | | | | | | | The SONAME field is only useful for shared libraries that application link against.
| * | Tests: Cover NO_SONAME property for SHARED librariesBrad King2015-08-205-0/+70
| | | | | | | | | | | | | | | | | | | | | | | | This property was added by commit v2.8.9~204^2~2 (Support building shared libraries or modules without soname, 2012-04-22). A test for using the property on MODULE libraries was added by commit v2.8.9~204^2~1 (Test NO_SONAME property, 2012-04-23). Add such a test for SHARED libraries too.
* | | Merge topic 'FindCUDA-vs2013-separate-compilation'Brad King2015-08-211-3/+2
|\ \ \ | | | | | | | | | | | | | | | | 9b2f6992 FindCUDA: Fix object build rule for separate compilation on VS 2013+ (#15697)
| * | | FindCUDA: Fix object build rule for separate compilation on VS 2013+ (#15697)Dominic Meiser2015-08-201-3/+2
| |/ / | | | | | | | | | | | | | | | The handling of multilevel dependencies has been fixed in Visual Studio 2013. The work around used for VS 2010 and VS 2012 does not work for VS 2013 any more. Switch to normal object build rules for VS 2013 and newer.
* | | Merge topic 'OUTPUT_NAME-genex-no-recursion'Brad King2015-08-217-35/+72
|\ \ \ | | | | | | | | | | | | | | | | 3c37d264 cmGeneratorTarget: Avoid recursion in GetOutputName method
| * | | cmGeneratorTarget: Avoid recursion in GetOutputName methodRobert Goulet2015-08-207-35/+72
| | | | | | | | | | | | | | | | | | | | | | | | Since support for generator expressions was added to OUTPUT_NAME it is possible for project code to cause recursion in this method by using a $<TARGET_FILE> genex. Detect and reject such cases.
* | | | Merge topic 'sublime-msvc-includes'Brad King2015-08-211-0/+4
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | c66835fc Extra Generator: Populate MSVC system include paths from environment (#15597)
| * | | | Extra Generator: Populate MSVC system include paths from environment (#15597)Gregor Jasny2015-08-181-0/+4
| | | | |
* | | | | Merge topic 'vs-fix-obj-extension'Brad King2015-08-211-2/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 3e94f94b cmLocalVisualStudioGenerator: Use computed .obj extension (#13685)
| * | | | | cmLocalVisualStudioGenerator: Use computed .obj extension (#13685)Bastien Schatt2015-08-181-2/+2
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CMAKE_<LANG>_OUTPUT_EXTENSION tells us the proper extension for the current toolchain. Teach the ComputeObjectFilenames method to use GetLanguageOutputExtension to look up the extension instead of hard-coding ".obj". This is already done in the code path for explicit file names inside our call to GetObjectFileNameWithoutTarget.
* | | | | Merge topic 'hp-ux-itanium-shared-libs'Brad King2015-08-211-3/+5
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 625225bb HP-UX: Do not use ".sl" extension for shared libs on Itanium
| * | | | | HP-UX: Do not use ".sl" extension for shared libs on ItaniumBrad King2015-08-181-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead use the standard ".so" extension. Suggested-by: Gerhard Grimm <gerhard.grimm@detec.com>
* | | | | | Merge topic 'get-filename-component-base-dir'Brad King2015-08-214-9/+87
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | e89ea3d1 get_filename_component: Teach new BASE_DIR parameter.
| * | | | | | get_filename_component: Teach new BASE_DIR parameter.James Johnston2015-08-184-9/+87
| | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | In the get_filename_component command, add a new BASE_DIR parameter to use with the ABSOLUTE and REALPATH options. This will be used when finding an absolute path from a relative path.
* | | | | | Merge topic 'determine-compiler-CMP0054'Brad King2015-08-212-6/+8
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | dc8822f0 CMakeDetermine{C,CXX}Compiler: Avoid if() auto-dereferene in quoted arguments
| * | | | | | CMakeDetermine{C,CXX}Compiler: Avoid if() auto-dereferene in quoted argumentsMatt McCormick2015-08-202-6/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Exposed by a CMP0054 warning with code like: cmake_minimum_required(VERSION 2.8.9 FATAL_ERROR) project(MyProj NONE) enable_language(C) enable_language(CXX) While at it, use STREQUAL for testing the compiler id against "GNU". Suggested-by: Rolf Eike Beer <eike@sf-mail.de>
* | | | | | | CMake Nightly Date StampKitware Robot2015-08-211-1/+1
| |_|_|_|/ / |/| | | | |
* | | | | | CMake Nightly Date StampKitware Robot2015-08-201-1/+1
| |_|_|_|/ |/| | | |
* | | | | 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)