summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* CMake Nightly Date StampKitware Robot2014-10-241-1/+1
|
* Merge branch 'release'Brad King2014-10-230-0/+0
|\
| * Merge branch 'xcode-ios-compiler-id' into releaseBrad King2014-10-222-3/+19
| |\
| * \ Merge branch 'doc-line-lengths' into releaseBrad King2014-10-2223-211/+308
| |\ \
* | \ \ Merge topic 'xcode-ios-compiler-id'Brad King2014-10-232-3/+19
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | | | | | b91020f6 Xcode: Fix compiler id detection when code signing is required c48f6e12 Xcode: Fix compiler id detection for iOS tools (#15214)
| * | | Xcode: Fix compiler id detection when code signing is requiredBrad King2014-10-222-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The iOS product type 'com.apple.package-type.bundle.unit-test' requires code signing on Xcode 6. Other iOS target types do too. Until CMake learns to add the CODE_SIGN_IDENTITY build attribute itself, toolchain files can set CMAKE_XCODE_ATTRIBUTE_CODE_SIGN_IDENTITY to tell the Xcode generator to add the attribute. Teach CMakeDetermineCompilerId to recognize this variable and add the CODE_SIGN_IDENTITY build attribute to the compiler id project.
| * | | Xcode: Fix compiler id detection for iOS tools (#15214)Brad King2014-10-222-3/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit 0cce556b (Xcode: Use sysroot and deployment target to identify compiler, 2014-04-29) our compiler id detection project uses the target platform SDK in case Xcode selects a different compiler based on it. Now the compiler id project actually compiles with the target compiler and SDK when cross-compiling. The iOS tools do not support the 'com.apple.product-type.tool' product type we use in our compiler id detection project. When targeting iPhone, use product type 'com.apple.product-type.bundle.unit-test' instead.
* | | | Merge topic 'doc-line-lengths'Brad King2014-10-2323-211/+308
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | 80b19a71 Help/manual: Avoid long lines in code blocks 4fdacedc Help: Clarify formatting of CPACK_WIX_ACL documentation 35ca4863 Help: Wrap long ctest_submit signature line 58b2d760 Modules: Format documentation to avoid over-long preformatted lines
| * | | Help/manual: Avoid long lines in code blocksBrad King2014-10-224-6/+21
| | | | | | | | | | | | | | | | | | | | | | | | Update the wording of some examples to avoid long lines in code blocks. Otherwise the formatted documentation can exceed certain column width limitations.
| * | | Help: Clarify formatting of CPACK_WIX_ACL documentationBrad King2014-10-221-2/+3
| | | |
| * | | Help: Wrap long ctest_submit signature lineBrad King2014-10-221-1/+5
| | | |
| * | | Modules: Format documentation to avoid over-long preformatted linesBrad King2014-10-2217-202/+279
| |/ / | | | | | | | | | | | | | | | Convert several preformatted code block literals that enumerate lists of options or variables to use reST definition lists instead. Manually wrap other long lines in code blocks.
* | | CMake Nightly Date StampKitware Robot2014-10-231-1/+1
| | |
* | | Merge branch 'release'Brad King2014-10-220-0/+0
|\ \ \ | | |/ | |/|
| * | Merge branch 'doc-CMAKE_XCODE_ATTRIBUTE' into releaseBrad King2014-10-223-0/+14
| |\ \
| * \ \ Merge branch 'ExternalProject-no-cygwin-hg-on-windows' into releaseBrad King2014-10-221-0/+7
| |\ \ \
| * \ \ \ Merge branch 'FindHg-no-cygwin-hg-on-windows' into releaseBrad King2014-10-221-0/+4
| |\ \ \ \
| * \ \ \ \ Merge branch 'cuda-rpath-osx' into releaseBrad King2014-10-221-12/+0
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'fix-OSX-bundle-rpaths-and-Qt5' into releaseBrad King2014-10-221-2/+16
| |\ \ \ \ \ \
* | \ \ \ \ \ \ Merge topic 'doc-CMAKE_XCODE_ATTRIBUTE'Brad King2014-10-223-0/+14
|\ \ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | 0ff69dd4 Help: Document CMAKE_XCODE_ATTRIBUTE_<an-attribute> variable (#15215)
| * | | | | | | Help: Document CMAKE_XCODE_ATTRIBUTE_<an-attribute> variable (#15215)Brad King2014-10-223-0/+14
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge topic 'FindHg-no-cygwin-hg-on-windows'Brad King2014-10-221-0/+4
|\ \ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | ed997de4 FindHg: Do not use cygwin hg on Windows
| * | | | | | FindHg: Do not use cygwin hg on WindowsBrad King2014-10-221-0/+4
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | The cygwin hg client is a text file with a '#!/bin/python" line. This cannot run on Windows.
* | | | | | Merge topic 'ExternalProject-no-cygwin-hg-on-windows'Brad King2014-10-221-0/+7
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | | | | | | | | | | | | | | ad984b60 Tests/ExternalProject: Skip Windows hg tests with cygwin hg
| * | | | | Tests/ExternalProject: Skip Windows hg tests with cygwin hgBrad King2014-10-221-0/+7
| |/ / / / | | | | | | | | | | | | | | | | | | | | The cygwin hg client is a text file with a '#!/bin/python" line. This cannot run on Windows.
* | | | | Merge topic 'cuda-rpath-osx'Brad King2014-10-221-12/+0
|\ \ \ \ \ | | |_|_|/ | |/| | | | | | | | | | | | | 59814cb4 FindCUDA: Remove rpath logic outdated by CMake's own @rpath support
| * | | | FindCUDA: Remove rpath logic outdated by CMake's own @rpath supportClinton Stimpson2014-10-221-12/+0
| |/ / / | | | | | | | | | | | | | | | | Otherwise binaries end up with two copies of the same value and the OS X install_name_tool may corrupt them.
* | | | Merge topic 'fix-OSX-bundle-rpaths-and-Qt5'Brad King2014-10-221-2/+16
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | 41564ff2 BundleUtilities: Ensure framework symlinks and Info.plist exist
| * | | BundleUtilities: Ensure framework symlinks and Info.plist existAdam Strzelecki2014-10-211-2/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This restores Qt SDK 4.8 and OS X >= 10.6.5 codesign compatibility improving embedding frameworks using correct bundle layout described at: https://developer.apple.com/library/mac/documentation/MacOSX/Conceptual/BPFrameworks/Concepts/FrameworkAnatomy.html 1. If Versions/VERSION/Resources/Info.plist is missing, well known incorrect locations are checked for Info.plist and Info.plist is copied from there, otherwise codesign will fail. 2. Root framework symlinks to binary and Resources are restored to point inside Versions/Current, otherwise Qt 4.8 looking for Resources/ in framework root will fail.
* | | | Merge topic 'release-upload-version'Brad King2014-10-221-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | c8616203 Utilities/Release: Update default binary distribution dir to v3.1
| * | | | Utilities/Release: Update default binary distribution dir to v3.1Brad King2014-10-211-1/+1
| | | | |
* | | | | Merge topic 'cpack-rpm-component-descriptions'Brad King2014-10-223-12/+134
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 603ef7fd CPackRPM: Add component based packaging description and summary
| * | | | | CPackRPM: Add component based packaging description and summaryDomen Vrankar2014-10-213-12/+134
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enable per-component description and summary setting through CPACK_RPM_<component>_PACKAGE_DESCRIPTION, CPACK_COMPONENT_<compName>_DESCRIPTION and CPACK_RPM_<component>_PACKAGE_SUMMARY variables. Extend the CPackComponentsForAll test to cover these.
* | | | | CMake Nightly Date StampKitware Robot2014-10-221-1/+1
| | | | |
* | | | | Merge topic 'cmake-cmp0054-warnings'Brad King2014-10-2124-49/+49
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 29c3edb8 Avoid if() quoted auto-dereference
| * | | | | Avoid if() quoted auto-dereferenceBen Boeckel2014-10-2025-50/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When testing CMAKE_<LANG>_COMPILER_ID values, do not explicitly dereference or quote the variable. We want if() to auto-dereference the variable and not its value. Also replace MATCHES with STREQUAL where equivalent.
* | | | | | Merge topic 'doc-policy-usage'Brad King2014-10-211-0/+6
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | cd4fa896 Help: Document that policies are not feature toggles.
| * | | | | | Help: Document that policies are not feature toggles.Stephen Kelly2014-10-201-0/+6
| | | | | | |
* | | | | | | Merge topic 'remove-borland-build'Brad King2014-10-2126-138/+9
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2db55ffa Remove borland workarounds.
| * | | | | | | Remove borland workarounds.Stephen Kelly2014-10-1526-138/+9
| | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | CMake 3.0 is the last release to require to be able to build with Borland.
* | | | | | | Merge topic 'remove-redundant-c_str'Brad King2014-10-2174-395/+395
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cc1139cc strings: Remove redundant calls to std::string::c_str()
| * | | | | | | strings: Remove redundant calls to std::string::c_str()Nils Gladitz2014-10-1574-395/+395
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replacements were detected and performed by the clang tool remove-cstr-calls on a linux build.
* | | | | | | | Merge topic 'ctest-delphi-coverage'Brad King2014-10-219-0/+556
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5c31c3e4 CTest: Add code coverage parser for Pascal/Delphi
| * | | | | | | | CTest: Add code coverage parser for Pascal/DelphiJoseph Snyder2014-10-219-0/+556
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a class to parse the HTML output of the Delphi-code-coverage tool http://code.google.com/p/delphi-code-coverage/ Add a test for the new parser.
* | | | | | | | | Merge topic 'update-kwiml'Brad King2014-10-211-1/+1
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 659605fb Merge branch 'upstream-kwiml' into update-kwiml 4871885b KWIML: Avoid if() quoted auto-dereference
| * \ \ \ \ \ \ \ \ Merge branch 'upstream-kwiml' into update-kwimlBrad King2014-10-141-1/+1
| |\ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / | |/| | | | | | | |
| | * | | | | | | | KWIML: Avoid if() quoted auto-dereferenceBen Boeckel2014-10-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When testing CMAKE_<LANG>_COMPILER_ID values with if(STREQUAL), do not explicitly dereference or quote the variable. We want if() to auto-dereference the variable and not its value.
* | | | | | | | | | Merge topic 'UseJava-classpath-cross-compile'Brad King2014-10-211-1/+1
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7a373d5e UseJava: Fix classpath separator on WIN32 cross compilation (#15206)
| * | | | | | | | | | UseJava: Fix classpath separator on WIN32 cross compilation (#15206)Lorenz Witte2014-10-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The condition to use ";" as classpath separator includes a check for the switch "WIN32" which is a target switch. When cross-compiling for a non-windows target, this switch is not present and the separator defaults to ":". It should check for "CMAKE_HOST_WIN32" instead.
* | | | | | | | | | | Merge topic 'UseSWIG-r-support'Brad King2014-10-211-0/+2
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9de113a9 UseSWIG: Fix R module prefix