summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'revert-definition-map-lookup' into releasev3.1.0-rc1Brad King2014-10-248-24/+276
|\
| * Merge branch 'parent-scope-tests' into variable-pull-failureBen Boeckel2014-10-245-0/+266
| |\ | | | | | | | | | | | | | | | | | | | | | | | | * parent-scope-tests: test: add a test for PARENT_SCOPE with multiple scopes test: add test for PARENT_SCOPE behavior Conflicts: Tests/RunCMake/set/RunCMakeTest.cmake
| | * test: add a test for PARENT_SCOPE with multiple scopesBen Boeckel2014-10-243-0/+249
| | | | | | | | | | | | See the comment in the test for what is being tested here.
| | * test: add test for PARENT_SCOPE behaviorBen Boeckel2014-10-243-0/+17
| | | | | | | | | | | | Test code courtesy of Alex Merry <alex.merry@kde.org>.
| * | Revert "cmDefinitions: Don't store parent lookups"Ben Boeckel2014-10-243-24/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 5abfde6cb8a1ae0b2825797eab6c2e9842eb7c49. The behaviors associated with implicit pulldown on variable lookup seriously conflict with the optimizations made in these commits. Basically, since values were copied upon variable lookup, not just on PARENT_SCOPE, coupled with PARENT_SCOPE's behavior based on whether the variable is in the current scope or not causes serious problems with not storing a value for every variable at every scope. The commit changed behavior of the following example, among other cases: function(test_set) set(blah "value2") message("before PARENT_SCOPE blah=${blah}") set(blah ${blah} PARENT_SCOPE) message("after PARENT_SCOPE blah=${blah}") endfunction() set(blah value1) test_set() message("in parent scope, blah=${blah}") Reported-by: Alex Merry <alex.merry@kde.org> Reported-by: Ben Cooksley <bcooksley@kde.org>
* | | Merge branch 'xcode-ios-compiler-id' into releaseBrad King2014-10-222-3/+19
|\ \ \
| * | | 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 branch 'doc-line-lengths' into releaseBrad King2014-10-2223-211/+308
|\ \ \ \
| * | | | 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.
* | | | Merge branch 'doc-CMAKE_XCODE_ATTRIBUTE' into releaseBrad King2014-10-223-0/+14
|\ \ \ \
| * | | | Help: Document CMAKE_XCODE_ATTRIBUTE_<an-attribute> variable (#15215)Brad King2014-10-223-0/+14
| |/ / /
* | | | Merge branch 'ExternalProject-no-cygwin-hg-on-windows' into releaseBrad King2014-10-221-0/+7
|\ \ \ \
| * | | | 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 branch 'FindHg-no-cygwin-hg-on-windows' into releaseBrad King2014-10-221-0/+4
|\ \ \ \
| * | | | 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 branch 'cuda-rpath-osx' into releaseBrad King2014-10-221-12/+0
|\ \ \ \
| * | | | 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 branch 'fix-OSX-bundle-rpaths-and-Qt5' into releaseBrad King2014-10-221-2/+16
|\ \ \ \
| * | | | 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.
* | | | | 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
generated by cgit v0.12 at 2024-12-27 06:51:00 (GMT)