summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
| * | | | | | UseSWIG: Fix R module prefixJulien Schueller2014-10-141-0/+2
| | | | | | |
* | | | | | | CMake Nightly Date StampKitware Robot2014-10-211-1/+1
| | | | | | |
* | | | | | | CMake Nightly Date StampKitware Robot2014-10-201-1/+1
| | | | | | |
* | | | | | | CMake Nightly Date StampKitware Robot2014-10-191-1/+1
| | | | | | |
* | | | | | | CMake Nightly Date StampKitware Robot2014-10-181-1/+1
| | | | | | |
* | | | | | | CMake Nightly Date StampKitware Robot2014-10-171-1/+1
| | | | | | |
* | | | | | | CMake Nightly Date StampKitware Robot2014-10-161-1/+1
| |_|_|_|_|/ |/| | | | |
* | | | | | CMake Nightly Date StampKitware Robot2014-10-151-1/+1
| |_|/ / / |/| | | |
* | | | | Begin post-3.1 developmentBrad King2014-10-143-2/+11
| | | | |
* | | | | Merge branch 'release'Brad King2014-10-143-12/+3
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | CMake 3.1.0-rc1 version updateBrad King2014-10-141-3/+3
| | | | |
| * | | | Help: Drop development topic notes to prepare releaseBrad King2014-10-142-9/+0
|/ / / / | | | | | | | | | | | | | | | | Release versions do not have the development topic section of the CMake Release Notes index page.
* | | | Merge topic 'CheckStructHasMember-avoid-breakage-on-Wall'Brad King2014-10-141-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 384d3ce7 CheckStructHasMember: avoid breakage on -Wall -Werror (#15203)
| * | | | CheckStructHasMember: avoid breakage on -Wall -Werror (#15203)Peter Wu2014-10-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | With CMAKE_C_FLAGS='-Wall -Werror', this test breaks due to -Werror=unused-value. Fix this by ignoring the return value.
* | | | | Merge topic 'fix-comment-typos'Brad King2014-10-1417-22/+22
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | bef23e81 Fix some spelling errors in comments
| * | | | Fix some spelling errors in commentsGeoff Viola2014-10-1317-22/+22
| | | | |
* | | | | CMake Nightly Date StampKitware Robot2014-10-141-1/+1
| | | | |
* | | | | Merge topic 'doc-3.1-relnotes'Brad King2014-10-1368-455/+382
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 856ee6be Help: Organize 3.1 release notes 52842820 Help: Consolidate 3.1 release notes
| * | | | | Help: Organize 3.1 release notesBrad King2014-10-101-181/+231
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add section headers similar to the 3.0 release notes and move each individual bullet into an appropriate section. Highlight the new VS generator capabilities for Windows Phone, Windows Store, and NVIDIA Nsight Tegra with dedicated subsections.
| * | | | | Help: Consolidate 3.1 release notesBrad King2014-10-1068-455/+332
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move all development release notes into a new version-specific document: tail -q -n +3 Help/release/dev/* > Help/release/3.1.0.rst git rm -- Help/release/dev/* except the sample topic: git checkout HEAD -- Help/release/dev/0-sample-topic.rst Reference the new document from the release notes index document. Add a title and intro sentence to the new document by hand.
* | | | | Merge topic 'fix-ninja-rc-include-flags'Brad King2014-10-138-9/+32
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | f4c5eade Ninja: Fix RC include directories regression
| * | | | | Ninja: Fix RC include directories regressionBrad King2014-10-138-9/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changes in commit b9aa5041 (cmLocalGenerator: Simplify GetIncludeFlags output formatting, 2014-03-04) caused Windows Resource Compiler include directories to be computed as relative paths in the Ninja generator. This breaks the cmcldeps handling of include paths. The reason for the regression is that several cmLocalGenerator::GetIncludeFlags callers treated the fourth "bool forResponseFile" argument as if it controlled whether include directories were a full path. It actually did control that by accident until the above commit. Add an explicit "bool forceFullPaths" argument to GetIncludeFlags and thread the value through ConvertToIncludeReference as needed. Update GetIncludeFlags call sites that really wanted to control the forResponseFile setting to be aware of the new argument. Extend the VSResource test to cover this case.
* | | | | | CMake Nightly Date StampKitware Robot2014-10-131-1/+1
| | | | | |
* | | | | | CMake Nightly Date StampKitware Robot2014-10-121-1/+1
| | | | | |
* | | | | | CMake Nightly Date StampKitware Robot2014-10-111-1/+1
| |/ / / / |/| | | |
* | | | | Merge topic 'note-link-libraries-genex'Brad King2014-10-101-0/+22
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 8bd81981 Help: Add note about restoring pre-3.0 link libraries genex behavior
| * | | | | Help: Add note about restoring pre-3.0 link libraries genex behaviorBrad King2014-10-101-0/+22
| |/ / / /
* | | | | Merge topic 'fix-OSX-bundle-rpaths-and-Qt5'Brad King2014-10-106-61/+229
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 631fadea Help: Add notes for topic 'fix-OSX-bundle-rpaths-and-Qt5' 50e261dd OSX: Warn when attempting to change runtime paths on OS X 10.5 9b98fd52 cmake-gui: Make sure we bundle Qt5 Cocoa platform plugin 83a06bb4 BundleUtilities: Framework codesign Resources/Info.plist & Current f7df82ac BundleUtilities: Resolve & replace @rpath placeholders 14bc686f GetPrerequisites: Make sure dyld placeholders are prefixes 6c313797 BundleUtilities: Use find on UNIX for fast executable lookup
| * | | | Help: Add notes for topic 'fix-OSX-bundle-rpaths-and-Qt5'Brad King2014-10-101-0/+6
| | | | |
| * | | | OSX: Warn when attempting to change runtime paths on OS X 10.5Clinton Stimpson2014-10-102-28/+55
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Even though 10.5 supports @rpath, the support is not complete enough for CMake. For instance, install_name_tool doesn't support adding and removing rpaths. Also modifying BundleUtilities test to remove an undesirable cmake generated runtime path. The intent was to build with the install rpath as is done with the other cases in this test.
| * | | | cmake-gui: Make sure we bundle Qt5 Cocoa platform pluginAdam Strzelecki2014-10-101-1/+27
| | | | | | | | | | | | | | | | | | | | Otherwise CMake.app bundle will not run when using Qt5.
| * | | | BundleUtilities: Framework codesign Resources/Info.plist & CurrentAdam Strzelecki2014-10-101-2/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We need to ensure copied framework has proper layout with Resources/Info.plist present next to versioned binary and Current symlink in Versions: https://developer.apple.com/library/mac/technotes/tn2206 https://developer.apple.com/library/mac/documentation/MacOSX/Conceptual/BPFrameworks/Concepts/FrameworkAnatomy.html If Resources/ is not present we may try to copy Contents/Info.plist if present to embedded Resources/Info.plist. This is a case of Qt5 that has obsolete/invalid framework layout (see QTBUG-38511).
| * | | | BundleUtilities: Resolve & replace @rpath placeholdersAdam Strzelecki2014-10-102-26/+98
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is done by gathering LC_RPATH commands for main bundle executable and using it for @rpath lookup in dependent frameworks. All functions that need to carry rpaths to now take optional <rpaths> argument. This enabled apps using @rpath to be bundled correctly, which will be necessary for upcoming Qt 5.4 that will use @rpath for all frameworks. Check that install_name_tool has -delete_rpath before using it. Otherwise it will fail with Xcode 3.x on 10.5 which has no -delete_rpath option for install_name_tool command, that was first introduced in 10.6 SDK, even that 10.5 supports LC_RPATH and @rpath.
| * | | | GetPrerequisites: Make sure dyld placeholders are prefixesAdam Strzelecki2014-10-101-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | Mac OS X dyld placeholders should be always prefixes, otherwise this can lead to some undefined behavior.
| * | | | BundleUtilities: Use find on UNIX for fast executable lookupAdam Strzelecki2014-10-101-1/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It makes whole executable process quicker on UNIX, especially for large bundles containing many files, since using find narrows results to only files having executable flags then all further tests follow. Since find ... -perm +0111 is not clearly POSIX compliant and some Linux versions refuse it, it is better to use longer but portable: find ... -perm \( -perm -0100 -o -perm -0010 -o -perm -0001 \)
* | | | | CMake Nightly Date StampKitware Robot2014-10-101-1/+1
| | | | |
* | | | | Merge topic 'FindThreads_overhaul'Brad King2014-10-091-36/+78
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b7e5c5a2 FindThreads: introduce THREADS_PREFER_PTHREAD_FLAG (#14767) bcb0e387 FindThreads: introduce an imported target to link to 46368edd FindThreads: move checking of the -pthread compiler flag into a macro
| * | | | | FindThreads: introduce THREADS_PREFER_PTHREAD_FLAG (#14767)Rolf Eike Beer2014-10-081-0/+18
| | | | | |