summaryrefslogtreecommitdiffstats
path: root/Modules
Commit message (Collapse)AuthorAgeFilesLines
* FindOpenMP: Use fixed form Fortran test programNils Gladitz2014-11-201-5/+5
| | | | | | This prevents the test program from failing when build as Fortran 77. Suggested-by: Alin Marin Elena <alinm.elena@gmail.com>
* Features: Don't record for AppleClangStephen Kelly2014-11-121-1/+2
| | | | | | | | | | | | | Features are currently recorded accidentally for all versions of AppleClang > 3.4 (I have no idea how that relates to upstream Clang). Presumably that version has the features which are accidentally recorded, but in the future features will be recorded initially for only AppleClang >= 5.1, which would appear as a feature regression. Commit v3.1.0-rc1~635^2~11 (Don't load Clang-CXX from AppleClang-CXX., 2013-11-11) ajusted the logic for the CXX language. Make a similar change for the C language.
* Merge branch 'ExternalProject-check-hash-before-download' into releaseBrad King2014-11-101-1/+14
|\
| * ExternalProject: Restore logic to not download already-existing fileBrad King2014-11-101-1/+14
| | | | | | | | | | | | | | | | | | | | The change in commit v3.1.0-rc1~85^2 (ExternalProject: Fix download retry logic, 2014-09-13) dropped the file(DOWNLOAD) EXPECTED_HASH argument. This prevents file(DOWNLOAD) from skipping the download if the output file already exists with the proper hash. Restore this check with explicit code in the download script. Reported-by: Ruslan Baratov <ruslan_baratov@yahoo.com>
* | Merge branch 'xcode-ios-compiler-id' into releaseBrad King2014-11-071-1/+1
|\ \
| * | Xcode: Fix compiler path detection for iOS tools on Xcode <= 5.0 (#15237)Brad King2014-11-071-1/+1
| |/ | | | | | | | | | | | | | | | | | | | | Since commit v3.1.0-rc1~1^2~1 (Xcode: Fix compiler id detection for iOS tools, 2014-10-22) our compiler id detection project sets the product type to 'com.apple.product-type.bundle.unit-test'. This causes the Ld command line on which we match the path to the compiler to have a 'CompilerIdC.xctest/' component. The commit updated our regex to match this, but placed it before the extra './' component that Xcode 5.0 and below produce. Xcode <= 5.0 prints '/./CompilerIdC.xctest/', so switch the order of the two components in the regex to match it.
* | Merge branch 'doc-cleanup-xrefs' into releaseBrad King2014-11-072-2/+2
|\ \
| * | Help: Fix broken cross-references reported by 'nitpicky' optionBrad King2014-11-072-2/+2
| | | | | | | | | | | | | | | Enable the Sphinx 'nitpicky' option and fix the resulting warnings about dangling references.
* | | Merge branch 'doc-formatting' into releaseBrad King2014-11-071-1/+2
|\ \ \ | |/ / |/| |
| * | Help: Wrap long lines in pre-formatted documentation blocksBrad King2014-11-071-1/+2
| | | | | | | | | | | | Help format the blocks better for display without a wide screen.
* | | Merge branch 'release-doc-formatting' into releaseBrad King2014-11-0713-140/+102
|\ \ \ | |/ /
| * | Modules: Wrap long lines in pre-formatted documentation blocksBrad King2014-11-0612-29/+38
| | | | | | | | | | | | Help format the blocks better for display without a wide screen.
| * | FindProtobuf: Cleanup reStructuredText documentation formattingBrad King2014-11-061-111/+64
| | | | | | | | | | | | Fix the markup to make the documentation format properly.
* | | Merge branch 'FindIce-no-envvar-markup' into releaseBrad King2014-11-031-1/+1
|\ \ \
| * | | FindIce: Drop use of :envvar: Sphinx markupBrad King2014-11-031-1/+1
| | | | | | | | | | | | | | | | | | | | We do not use it elsewhere yet, and do not want to index environment variables inconsistently.
* | | | Merge branch 'watcom-drop-symfile-option' into releaseBrad King2014-11-031-2/+2
|\ \ \ \
| * | | | Watcom: Drop symfile linker optionJ Decker2014-11-031-2/+2
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cleanup of Windows-wcl386.cmake in commit v3.1.0-rc1~693^2 (Watcom: Cleanup Windows-wcl386 configuration, 2014-04-01) also introduced use of the 'symfile' link option but did not mention it in the commit message. There is no way to set the symbol file name of a target, so it is better to revert that change. It is easy to run 'wstrip *' if the symbols need to be stripped, but it is very difficult to get the right names for the .sym files to install with debug/rel_with_deb_info configurations.
* | | | Merge branch 'fix-configure_file-COPYONLY' into releaseBrad King2014-11-031-1/+1
|\ \ \ \
| * | | | Qt4: Fix configure_file call to use COPYONLY, not COPY_ONLYBrad King2014-10-311-1/+1
| |/ / /
* | | | Merge branch 'FindCurses-include-CheckLibraryExists' into releaseBrad King2014-10-291-1/+2
|\ \ \ \ | |_|_|/ |/| | |
| * | | FindCurses: Include CheckLibraryExists before using it (#15220)Brad King2014-10-281-1/+2
| |/ / | | | | | | | | | | | | Include the module at the top unconditionally so that all code paths can use it.
* | | 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-2217-202/+279
|\ \ \ | | |/ | |/|
| * | 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 '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.
* | | 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-OSX-bundle-rpaths-and-Qt5'Brad King2014-10-102-32/+141
|\ \ | |/ | | | | | | | | | | | | | | | | | | 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
| * 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 \)
* | 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
| | |
| * | FindThreads: introduce an imported target to link toTimo Rothenpieler2014-10-081-0/+18
| | | | | | | | | | | | | | | | | | This not only holds the library, but can also hold compiler flags needed, e.g. the -pthread flag preferred by gcc on some platforms. There was no clean way to get that compiler flag from the module until now.
| * | FindThreads: move checking of the -pthread compiler flag into a macroRolf Eike Beer2014-10-061-36/+42
| | | | | | | | | | | | | | | | | | This allows a following commit to introduce a switch to prefer that check over searching for the explicit library names without breaking backward compatibility.
* | | Merge topic 'FPHSA_exact_version'Brad King2014-10-081-7/+36
|\ \ \ | | | | | | | | | | | | | | | | | | | | ba907f7d FPHSA: fix when requested or found version is exactly 0 4f9bf446 FPHSA: when EXACT version match is requested only compare the components given
| * | | FPHSA: fix when requested or found version is exactly 0Rolf Eike Beer2014-10-071-3/+4
| | | | | | | | | | | | | | | | | | | | Until now it was checked with "if(VAR)", which will be false in case "0" is the content of the variable.
| * | | FPHSA: when EXACT version match is requested only compare the components givenRolf Eike Beer2014-10-071-4/+32
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | Given that you have a foobar that identifies itself as 1.2.3 from now on a find_package(foobar 1.2 EXACT) will succeed, as 1.2.3 will now be considered as being 1.2. Until now this was only the case for version 1.2.0.
* | | Merge topic 'FindLATEX-cross-compile-ps2pdf14'Brad King2014-10-081-1/+1
|\ \ \ | | | | | | | | | | | | | | | | 63262434 FindLATEX: Search for ps2pdf14 even on Windows (#15198)
| * | | FindLATEX: Search for ps2pdf14 even on Windows (#15198)Brad King2014-10-071-1/+1
| | |/ | |/| | | | | | | | | | When cross-compiling from Linux to Windows the tool on the host does not have a .bat extension.
* | | Merge topic 'ctest-memcheck-sanitizers'Brad King2014-10-071-0/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | f25e431d tests: set sanitizer options properly f0661bf3 tests: fix copy/paste from tsan -> asan comments ca9cc25c ctest: add support for additional sanitizer options 0b9ffffc ctest: update documentation for CTEST_MEMORYCHECK_TYPE
| * | | ctest: add support for additional sanitizer optionsBen Boeckel2014-10-031-0/+1
| | |/ | |/| | | | | | | | | | Sanitizers receive options through their environment variable; support user-specified options here.
* | | Merge topic 'FindBoost-CMP0054'Brad King2014-10-071-4/+4
|\ \ \ | | | | | | | | | | | | | | | | c9300464 FindBoost: Avoid if() quoted auto-dereference