summaryrefslogtreecommitdiffstats
path: root/Modules
Commit message (Collapse)AuthorAgeFilesLines
* 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-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
| * | | FindBoost: Avoid if() quoted auto-dereferenceNils Gladitz2014-10-061-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | When testing CMAKE_CXX_COMPILER[_ID] values with if(MATCHES) or if(STREQUAL), do not explicitly dereference or quote the variable. We want if() to auto-dereference the variable and not its value.
* | | | Merge topic 'cpack-ifw-updates'Brad King2014-10-071-44/+114
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | | | | ed9684a2 CPackIFW: Added support for multiple repositories f9f74874 CPackIFW: Search algorithm update
| * | | CPackIFW: Added support for multiple repositoriesKonstantin Podsvirov2014-10-051-3/+92
| | | | | | | | | | | | | | | | Now user can add IFW specific repo with cpack_ifw_add_repository macro
| * | | CPackIFW: Search algorithm updateKonstantin Podsvirov2014-10-041-41/+22
| |/ / | | | | | | | | | Variables like CPACK_IFW_*_EXECUTABLE_FOUND now not needed
* | | Merge topic 'FindThreads-macro'Brad King2014-10-061-23/+17
|\ \ \ | |/ / |/| | | | | | | | 94a061d3 FindThreads: use a macro for the repetitive thread library checks
| * | FindThreads: use a macro for the repetitive thread library checksRolf Eike Beer2014-10-031-23/+17
| |/
* | Merge topic 'FPHSA-include'Brad King2014-10-034-4/+4
|\ \ | | | | | | | | | | | | 3670c6a4 fix inclusion of FPHSA
| * | fix inclusion of FPHSARolf Eike Beer2014-10-024-4/+4
| |/ | | | | | | Make sure these modules also include exactly the version shipped with CMake.
* | Merge topic 'FindThreads-dir'Brad King2014-10-031-1/+1
|\ \ | | | | | | | | | | | | cbd5db64 FindThreads: search test source relative to module
| * | FindThreads: search test source relative to moduleTimo Rothenpieler2014-10-021-1/+1
| |/ | | | | | | This is a simpler way to reference the location of FindThreads.cmake.
* | Merge topic 'FindLua-exact'Brad King2014-10-031-1/+1
|\ \ | | | | | | | | | | | | c4a56b9c FindLua: fix wrong version list if EXACT is given
| * | FindLua: fix wrong version list if EXACT is givenRolf Eike Beer2014-10-021-1/+1
| |/
* | FindVTK: Drop this ancient compatibility moduleBrad King2014-10-021-66/+0
| | | | | | | | | | | | | | The FindVTK module only existed to help find_package(VTK) calls work in old projects written to use "USE_VTK_FILE" instead of "VTK_USE_FILE". Drop it to allow find_package(VTK) calls to search for VTKConfig.cmake directly.
* | FindITK: Drop this ancient compatibility moduleBrad King2014-10-021-61/+0
|/ | | | | | | The FindITK module only existed to help find_package(ITK) calls work in old projects written to use "USE_ITK_FILE" instead of "ITK_USE_FILE". Drop it to allow find_package(ITK) calls to search for ITKConfig.cmake directly.
* Merge topic 'cleanup-CMP0054'Brad King2014-09-301-7/+7
|\ | | | | | | | | 69fe5920 GenerateExportHeader: Avoid if() quoted auto-dereference
| * GenerateExportHeader: Avoid if() quoted auto-dereferenceBrad King2014-09-291-7/+7
| | | | | | | | | | | | When testing CMAKE_CXX_COMPILER_ID values with if(MATCHES), do not explicitly dereference or quote CMAKE_CXX_COMPILER_ID. We want if() to auto-dereference the variable and not its value.
* | Merge topic 'GNUInstallDirs-typo'Brad King2014-09-301-2/+2
|\ \ | | | | | | | | | | | | 33f03129 Fix typo in Modules/GNUInstallDirs.cmake (#15176)
| * | Fix typo in Modules/GNUInstallDirs.cmake (#15176)David Coppa2014-09-291-2/+2
| |/ | | | | | | | | Commit d4fdd9c189f85d659f4294f8ec6da3e7e51215ec ("GNUInstallDirs: use the proper default for info and man paths on OpenBSD") introduced a typo.
* | Merge topic 'vs-nsight-tegra-generator'Brad King2014-09-304-5/+82
|\ \ | |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | df84281d Help: Add notes for topic 'vs-nsight-tegra-generator' 69e198dc VS: Generate Nsight Tegra project revision number 5365c9ac VS: Map Nsight Tegra file types in .vcxproj files 178f56a5 VS: Fix Tegra-Android platform linking of libraries by name 7115702f Tests: Add test for VS Nsight Tegra generator support a6289499 VS: Generate ANDROID_GUI executables as app packages c12e4699 Add 'ANDROID_API' target property to set Android Target API 9a4df52a Add 'ANDROID_GUI' target property to mark Android applications 16569abf cmTarget: Track internally whether platform is Android ef0fd4f0 VS: Teach vcxproj generation about the Tegra-Android platform d09b60f5 VS: Detect compiler id of Nsight Tegra-Android toolchains 2f071466 VS: Teach VS >= 10 to recognize CMAKE_SYSTEM_NAME 'Android'
| * VS: Fix Tegra-Android platform linking of libraries by nameBrad King2014-09-301-0/+6
| | | | | | | | | | | | | | Nsight Tegra Visual Studio Edition handles prefixing of library names with '-l' automatically, so teach the generator not to do so. Reported-by: Mourad Boufarguine <mourad@boufarguine.name>
generated by cgit v0.12 at 2024-12-27 21:53:48 (GMT)