summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* CPack/DEB: test preserve extra config file permissionsDomen Vrankar2015-09-173-5/+42
|
* CPackDeb: use of libarchive and removal of fakerootRaffi Enficiaud2015-09-174-120/+241
|
* cmArchiveWrite: control user/group, permissions and recursive file addingRaffi Enficiaud2015-09-172-6/+128
|
* Tests: Make RunCMake.CPack error messages more readableRaffi Enficiaud2015-09-173-6/+7
|
* cmGeneratedFileStream: Fix spelling in commentRaffi Enficiaud2015-09-171-2/+2
| | | | s/destionation/destination/
* Merge topic 'fix-TrimWhitespace'Brad King2015-09-111-3/+8
|\ | | | | | | | | | | 9c4a500f cmSystemTools: Fix TrimWhitespace for non-ascii strings (#15735) 87a9061d cmSystemTools: Factor out a cm_isspace helper
| * cmSystemTools: Fix TrimWhitespace for non-ascii strings (#15735)Brad King2015-09-101-2/+2
| | | | | | | | | | | | | | | | Since commit v2.8.11~59^2 (cmSystemTools: Generalize TrimWhitespace to all whitespace, 2013-03-27) we incorrectly use `c <= ' '` to determine if `c` is a whitespace character. With a signed `char` type UTF-8 encoded strings may be truncated because values above 0x7f appear negative and therefore less than 0x20. Use `isspace(c)` instead.
| * cmSystemTools: Factor out a cm_isspace helperBrad King2015-09-101-1/+6
| | | | | | | | | | | | Extract the logic added by commit v3.1.0-rc1~386^2 (Encoding: Fix debug asserts ... with non-ascii chars, 2014-06-16) into a helper function so we can re-use it.
* | Merge topic 'compiler-features-robustness'Brad King2015-09-111-1/+1
|\ \ | | | | | | | | | | | | 150e1b27 Features: Extract strings from test binary more reliably (#15736)
| * | Features: Extract strings from test binary more reliably (#15736)Brad King2015-09-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit v3.1.0-rc1~635^2~7 (project: Add infrastructure for recording CXX compiler features, 2013-10-17) we compile a test source to a binary and then extract "<LANG>_FEATURES:..." strings from the binary with the file(STRINGS) command. Add a newline at the beginning of the string literal to be sure file(STRINGS) can extract the first entry as a string independent of whatever else the compiler may put before the storage it allocates for the literal within the binary.
* | | Merge topic 'revert-fix-windows-version-detection'Brad King2015-09-111-46/+10
|\ \ \ | | | | | | | | | | | | | | | | 4c7744c8 Revert "Windows: Fix CMAKE_HOST_SYSTEM_VERSION on Windows >= 8.1 (#15674)"
| * | | Revert "Windows: Fix CMAKE_HOST_SYSTEM_VERSION on Windows >= 8.1 (#15674)"Brad King2015-09-101-46/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit d4736d53cd61f2cbbb36bec682663b74b01dddce. RtlGetVersion is a private API not meant for public use. Another solution to detecting the Windows version will be needed. Reported-by: Gilles Khouzam <Gilles.Khouzam@microsoft.com>
* | | | CMake Nightly Date StampKitware Robot2015-09-111-1/+1
| |/ / |/| |
* | | Merge topic 'cpack-cmake-special-characters-mangling'Brad King2015-09-106-43/+68
|\ \ \ | | | | | | | | | | | | | | | | 2a7772ff CPack: don't mangle CMake-special characters when applying default settings
| * | | CPack: don't mangle CMake-special characters when applying default settingsRoman Donchenko2015-09-096-43/+68
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Mangling is prevented by using a function instead of a macro for setting default value of some CPack variables. Function is meant for internal use in CPack.cmake only. Old macro is deprecated but kept for backwards compatibility - was intended for internal use only as it can't be used for CPack after CPack.cmake script is included. Patch removes local workarounds that were required by old macro, fixes default setting of variables that by default inherit value from another variable that already went through old default setting macro (e.g. value of CPACK_PACKAGE_INSTALL_REGISTRY_KEY caused error for wrong escapes if CPACK_PACKAGE_INSTALL_DIRECTORY contained escaped back slashes) and provides a test for correct escaping of characters.
* | | | 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
| | | | | |