summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'cpack-deb-component-dependencies'Brad King2015-09-104-28/+109
|\ | | | | | | | | 4de7c812 CPack/Deb: enable per component setting of dependencies
| * CPack/Deb: enable per component setting of dependenciesDomen Vrankar2015-09-094-28/+109
| |
* | Merge topic 'FindwxWidgets-updates'Brad King2015-09-102-5/+38
|\ \ | | | | | | | | | | | | | | | | | | | | | d8e233d8 Help: Add notes for topic 'FindwxWidgets-updates' 15aacb68 FindwxWidgets: Add wxWidgets webview component 8122fbd0 FindwxWidgets: Expect wxWidgets 3.1 6089fde5 FindwxWidgets: allow specifying required version
| * | Help: Add notes for topic 'FindwxWidgets-updates'Brad King2015-09-091-0/+4
| | |
| * | FindwxWidgets: Add wxWidgets webview componentSimon Richter2015-09-091-1/+1
| | |
| * | FindwxWidgets: Expect wxWidgets 3.1Simon Richter2015-09-091-1/+5
| | |
| * | FindwxWidgets: allow specifying required versionSimon Richter2015-09-091-3/+28
| | |
* | | Merge topic 'FindSWIG-noproxy'Brad King2015-09-101-4/+6
|\ \ \ | | | | | | | | | | | | | | | | 96a8890c FindSWIG: Do not generate erroneous outputs with -noproxy
| * | | FindSWIG: Do not generate erroneous outputs with -noproxyBen Webb2015-09-091-4/+6
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Generally for a module foo, SWIG generates (in Python mode) an extension module _foo.so and a proxy Python module foo.py. However, if -noproxy is specified, instead it builds only foo.so (without the leading underscore). The custom command generated by CMake correctly handles the removal of this underscore when -noproxy is given; however, it still adds foo.py to the expected outputs. This upsets build tools that expect foo.py to be generated (for example, 'make' will run the SWIG command twice). Fix this by removing foo.py from the set of extra generated files when -noproxy is specified.
* | | Merge topic 'apple-no-libnetwork'Brad King2015-09-101-0/+8
|\ \ \ | | | | | | | | | | | | | | | | 01b6ecdb curl: Do not use libnetwork on Apple platforms
| * | | curl: Do not use libnetwork on Apple platformsGregor Jasny2015-09-101-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Starting with OS X 10.11 there is a library called libnetwork which will be picked up during curl configuration. This breaks backward compatibility of the resulting binaries because libnetwork is not available on older OS X versions.
* | | | Merge topic 'mingw-compile-features-C'Brad King2015-09-102-2/+7
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 2fbc41f3 Record compile features for GNU C on Windows (#15727)
| * | | | Record compile features for GNU C on Windows (#15727)Brad King2015-09-092-2/+7
| | |/ / | |/| | | | | | | | | | Drop the 'UNIX' condition on GNU C compiler features.
* | | | Merge topic 'ar-option-order'Brad King2015-09-104-4/+4
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 08659ff4 Re-order 'ar' options 'cq' => 'qc'
| * | | | Re-order 'ar' options 'cq' => 'qc'Brad King2015-09-094-4/+4
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The documetnation of binutils: https://sourceware.org/binutils/docs/binutils/ar-cmdline.html suggests to use the parameters "q" and "c" in this order ("q" is operation, and "c" is the modifier). Suggested-by: Дилян Палаузов <dilyan.palauzov@aegee.org>
* | | | Merge topic 'ghs-updates'Brad King2015-09-102-18/+41
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 04de9007 GHS: Fix generated file path slashes and quoting for 6.1.6 fbe0de92 GHS: Tell MULTI to delete .elf.ael file 63591b94 GHS: Find latest 'int' directory
| * | | | GHS: Fix generated file path slashes and quoting for 6.1.6Geoff Viola2015-09-091-4/+7
| | | | |
| * | | | GHS: Tell MULTI to delete .elf.ael fileGeoff Viola2015-09-091-7/+5
| | | | |
| * | | | GHS: Find latest 'int' directoryGeoff Viola2015-09-091-7/+29
| |/ / /
* | | | CMake Nightly Date StampKitware Robot2015-09-101-1/+1
| |_|/ |/| |
* | | Merge topic 'more-swift2-fixes'Brad King2015-09-097-12/+87
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9cdf6ef4 Swift: Add proper Swift compiler test 1aa29f0d Swift: Remove positive Swift language tests d778a1c2 Swift: Require Xcode 6.1 and for MacOS X at least SDK 10.10 4da60024 Swift: Fix Compiler-Id detection for Swift 2 874a265c Swift: Make SwiftMix compatible with Swift 2
| * | | Swift: Add proper Swift compiler testGregor Jasny2015-09-061-1/+51
| | | | | | | | | | | | | | | | | | | | This catches for example the unavailability of Swift with Xcode Beta6 and macosx10.10 SDK.
| * | | Swift: Remove positive Swift language testsGregor Jasny2015-09-063-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It's relatively complex to determine in advance if a Xcode, SDK, and Deployment Target configuration is capable of running Swift. For example the following combinations do not work: * deployment target < OS X 10.9 * Xcode 6.2 and macosx10.9 SDK * Xcode 7 Beta 6 and macosx10.10 SDK Until we found out how to query Xcode for Swift support in a reliable way, the RunCMake.Swift test cases will be restricted to negative ones.
| * | | Swift: Require Xcode 6.1 and for MacOS X at least SDK 10.10Gregor Jasny2015-09-051-4/+31
| | | |
| * | | Swift: Fix Compiler-Id detection for Swift 2Gregor Jasny2015-09-031-1/+1
| | | |
| * | | Swift: Make SwiftMix compatible with Swift 2Gregor Jasny2015-09-031-2/+4
| | |/ | |/|
* | | Merge topic 'fix-xcode-gtk2-tests'Brad King2015-09-091-0/+3
|\ \ \ | | | | | | | | | | | | | | | | 3b906c80 GTK2: Add --build-project to all GTK2 tests
| * | | GTK2: Add --build-project to all GTK2 testsGregor Jasny2015-09-061-0/+3
| |/ / | | | | | | | | | Otherwise xcodebuild invocation will fail.
* | | Merge topic 'doc-get_filename_component-typo'Brad King2015-09-091-1/+1
|\ \ \ | | | | | | | | | | | | | | | | 8bfa34b7 Help: Fix typo in get_filename_component docs
| * | | Help: Fix typo in get_filename_component docsChristopher Meng2015-09-081-1/+1
| | | | | | | | | | | | | | | | trailing slahes -> trailing slashes
* | | | Merge topic 'wbpvf_no_deref'Brad King2015-09-093-14/+14
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | ea080e3e write_basic_package_version_file: remove variable dereferences in templates
| * | | | write_basic_package_version_file: remove variable dereferences in templatesRolf Eike Beer2015-09-043-14/+14
| | | | | | | | | | | | | | | | | | | | Fixes some minor whitespace issues in the if()s.
* | | | | Merge topic 'vs14-win8-store-phone'Brad King2015-09-094-2/+26
|\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | | | | | | 4b8b9168 VS: Find Desktop SDK for current VS version (#15662)
| * | | | VS: Find Desktop SDK for current VS version (#15662)Gilles Khouzam2015-09-024-2/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Determine the Desktop SDK for Windows Phone and Windows Store from the generator instead of the version of the targeted app. This allows to build a Windows Phone 8.1 app on VS 2015 for example.
* | | | | CMake Nightly Date StampKitware Robot2015-09-091-1/+1
| | | | |
* | | | | Merge topic 'fix-buildsystem-target-properties'Brad King2015-09-0817-31/+90
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b9856862 Tests: Cover set_property for buildsystem target properties 407ff47e cmTarget: Fix memory leak when SOURCES property is cleared cf74fc24 cmTarget: Fix buildsystem property empty value set and append operations
| * | | | | Tests: Cover set_property for buildsystem target propertiesBrad King2015-09-0316-7/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extend the RunCMake.set_property test with cases covering buildsystem target properties: * COMPILE_DEFINITIONS * COMPILE_FEATURES * COMPILE_OPTIONS * INCLUDE_DIRECTORIES * LINK_LIBRARIES * SOURCES Also test a non-buildsystem property to document the current difference in behavior. Refactor the existing LINK_LIBRARIES case to the same more-extensive test as the rest. Use the output generated by CMake 3.3 as the expected output for each test case.
| * | | | | cmTarget: Fix memory leak when SOURCES property is clearedBrad King2015-09-031-0/+1
| | | | | |
| * | | | | cmTarget: Fix buildsystem property empty value set and append operationsBrad King2015-09-031-24/+48
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactoring in commit 1f54bc1c (cmTarget: Split storage of include directories from genexes, 2015-08-04), commit 772ecef4 (cmTarget: Split storage of compile options from genexes, 2015-08-04), commit 44e071ae (cmTarget: Split storage of compile features from genexes, 2015-08-04), and commit 197f4de1 (cmTarget: Split storage of compile definitions from genexes, 2015-08-04) failed to account for value==NULL in SetProperty and AppendProperty methods.
* | | | | Merge topic 'find_program-NAMES_PER_DIR'Brad King2015-09-0823-27/+214
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8ea7611b find_program: Optionally consider all names in each directory fc1990c9 cmFindProgramCommand: Re-implement search using more flexible approach fdbfc9f6 Tests: Add explicit testing for find_program 907a919b cmSystemTools: Drop unused StringEndsWith method ed4de3c9 cmFindProgramCommand: Use Names member instead of passing it bf32b95e cmFindLibraryCommand: Avoid repeating search for the same name
| * | | | | find_program: Optionally consider all names in each directoryBrad King2015-09-027-1/+64
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When more than one value is given to the NAMES option this command by default will consider one name at a time and search every directory for it. Add a NAMES_PER_DIR option to tell this command to consider one directory at a time and search for all names in it.
| * | | | | cmFindProgramCommand: Re-implement search using more flexible approachBrad King2015-09-022-1/+97
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Avoid using KWSys SystemTools::FindProgram because it does much more than we actually need for find_program and does not allow us to control the order of preference between directories and names. Create our own cmFindProgramHelper much like cmFindLibraryHelper but without all the find_library-specific parts.
| * | | | | Tests: Add explicit testing for find_programBrad King2015-09-0214-0/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously this command was tested only implicitly as part of larger tests. Add a RunCMake.find_program test to cover find_program cases specifically and independently.
| * | | | | cmSystemTools: Drop unused StringEndsWith methodBrad King2015-09-022-11/+0
| | | | | | | | | | | | | | | | | | | | | | | | It has no callers and we can inherit one from KWSys SystemTools anyway.
| * | | | | cmFindProgramCommand: Use Names member instead of passing itBrad King2015-09-022-13/+10
| | | | | |
| * | | | | cmFindLibraryCommand: Avoid repeating search for the same nameBrad King2015-09-021-2/+9
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In FindNormalLibraryDirsPerName we consider one name at a time and search the entire path. Avoid repeated consideration of names by removing each one from the list of candidates before considering the next one. This will not change behavior because we already know the earlier candidates were not found on repeated considering anyway.
* | | | | Merge topic 'FindOpenSSL-static-libs'Brad King2015-09-082-5/+35
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 369a8cde FindOpenSSL: Optionally search only for static libraries
| * | | | | FindOpenSSL: Optionally search only for static librariesThijs Wenker2015-09-022-5/+35
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add an OPENSSL_USE_STATIC_LIBS option to enable it. Adjust CMAKE_FIND_LIBRARY_SUFFIXES to only look for .a and .lib files. Also adjust the search paths on Windows for installer locations of static libraries.
* | | | | Merge topic 'FindZLIB-per-config'Brad King2015-09-082-5/+45
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 11097f52 FindZLIB: Find debug and release variants separately
| * | | | | FindZLIB: Find debug and release variants separatelyMichael Scott2015-09-022-5/+45
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | Provide each variant in ZLIB_LIBRARIES and ZLIB::ZLIB imported location properties when one is found, while maintaining support for manually setting the library via ZLIB_LIBRARY.