summaryrefslogtreecommitdiffstats
path: root/Modules
Commit message (Collapse)AuthorAgeFilesLines
* 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 '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>
| * VS: Detect compiler id of Nsight Tegra-Android toolchainsBrad King2014-09-293-5/+76
| | | | | | | | | | | | | | | | | | | | Teach CMakeDetermineCompilerId to recognize the Tegra-Android platform and generate a test project for Nsight Tegra tools. Locate the full path to CMAKE_<LANG>_COMPILER by computing it within the test project build environment. Also teach CMakeFindBinUtils that this variant of the Visual Studio generator uses UNIX-like instead of MS-like archiving and linking tools.
* | FindCUDA: Avoid if() auto-dereference in string comparisonsAdam Strzelecki2014-09-242-8/+8
| | | | | | | | This silences possible CMP0054 warnings.
* | Merge topic 'FindGettext-doc-update'Brad King2014-09-221-1/+1
|\ \ | | | | | | | | | | | | 3919f254 FindGettext: Fix name of GETTEXT_PROCESS_POT_FILE in docs (#15162)
| * | FindGettext: Fix name of GETTEXT_PROCESS_POT_FILE in docs (#15162)Brad King2014-09-181-1/+1
| | | | | | | | | | | | | | | | | | Rename GETTEXT_PROCESS_POT to GETTEXT_PROCESS_POT_FILE. Patch-by: maahnat@gmail.com
| * | Merge branch 'ExternalProject-download-loop' into releaseBrad King2014-09-081-0/+1
| |\ \
| * \ \ Merge branch 'fix-clang-cross-compile-find-binutils' into releaseBrad King2014-09-052-2/+6
| |\ \ \
| * | | | BundleUtilities: Allow Info.plist files which use CR line endingsTim Blechmann2014-08-071-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Convert \r to our internal end-of-line character just as we do \n. Signed-off-by: Tim Blechmann <tim@klingt.org>
| * | | | Merge branch 'check-flag-avoid-semicolon' into releaseBrad King2014-07-301-1/+1
| |\ \ \ \
| * \ \ \ \ Merge branch 'FindQt4-more-plugins' into releaseBrad King2014-07-281-3/+3
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'fix-QCC-compile-flags' into releaseBrad King2014-07-176-27/+41
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'wince-fix-dll-linking' into releaseBrad King2014-07-101-4/+6
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'CMakeExpandImportedTargets-CMP0045' into releaseBrad King2014-07-071-2/+10
| |\ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ Merge topic 'FindProtobuf-depend-protoc'Brad King2014-09-221-1/+1
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e380d7c5 FindProtobuf: Make outputs depend on protoc executable
| * | | | | | | | | | FindProtobuf: Make outputs depend on protoc executableMichael Hanselmann2014-09-181-1/+1
| | |_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | After updating from Protocol Buffers 2.5.0 to 2.6.0 compilation of the generated source failed: "This file was generated by an older version of protoc which is incompatible with your Protocol Buffer headers. Please regenerate this file with a newer version of protoc.". Turns out the source and headers generated by way of FindProtobuf.cmake:PROTOBUF_GENERATE_CPP aren't updated. Adding a dependency on the compiler executable fixes this issue.
* | | | | | | | | | Merge topic 'FindOpenSceneGraph-pieces-not-found'Brad King2014-09-221-2/+5
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b683da3e FindOpenSceneGraph: Do not add unfound OSG libs if not required
| * | | | | | | | | | FindOpenSceneGraph: Do not add unfound OSG libs if not requiredMattias Helsing2014-09-181-2/+5
| |/ / / / / / / / /
* | | | | | | | | | Merge topic 'clang-compile-options-cxx14'Brad King2014-09-221-3/+6
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 49b8140e Clang: Enable c++14 dialect flag with Clang 3.5. 0b80fc35 Clang: Don't overwrite c++11 compile option value with c++14 flag.
| * | | | | | | | | | Clang: Enable c++14 dialect flag with Clang 3.5.Stephen Kelly2014-09-171-1/+4
| | | | | | | | | | |
| * | | | | | | | | | Clang: Don't overwrite c++11 compile option value with c++14 flag.Stephen Kelly2014-09-171-2/+2
| |/ / / / / / / / /
* | | | | | | | | | Merge topic 'cleanup-CMP0054'Brad King2014-09-222-2/+2
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fa7d47ac Tests: Fix CMP0054 warnings 3b5ea54a CheckPrototypeDefinition: Avoid if() auto-dereference c9b301cd ExternalProject: Fix CMP0054 warning in _ep_parse_arguments
| * | | | | | | | | | CheckPrototypeDefinition: Avoid if() auto-dereferenceBrad King2014-09-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Convert from the old if(MATCHES) hack to if(DEFINED) to check whether the result variable is already set.
| * | | | | | | | | | ExternalProject: Fix CMP0054 warning in _ep_parse_argumentsMatt McCormick2014-09-151-1/+1
| |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix the CMP0054 warning: CMake Warning (dev) at .../Modules/ExternalProject.cmake:242 (if): Policy CMP0054 is not set: Only interpret if() arguments as variables or keywords when unquoted. Run "cmake --help-policy CMP0054" for policy details. Use the cmake_policy command to set the policy and suppress this warning. Quoted keywords like "COMMAND" will no longer be interpreted as keywords when the policy is set to NEW. Since the policy is not set the OLD behavior will be used. Call Stack (most recent call first): .../Modules/ExternalProject.cmake:1938 (_ep_parse_arguments) CMakeLists.txt:5 (ExternalProject_Add) by avoiding a reference to "${key}" or "COMMAND" in quotes.
* | | | | | | | | | Merge topic 'ExternalProject-retry'Brad King2014-09-221-6/+0
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | 30a94eec ExternalProject: Fix download retry logic
| * | | | | | | | | ExternalProject: Fix download retry logicRuslan Baratov2014-09-151-6/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Do not check file's hash in download script. If hash will not match command ``file(DOWNLOAD ...)`` will fail with FATAL_ERROR, ``cmake -P`` will exit with unsuccessful code, and the build will stop. Leave hash checking to the existing implementation in the verify step.
* | | | | | | | | | Merge topic 'vs-generator-platform'Brad King2014-09-151-2/+2
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | be6a555d Tests: Test setting a generator platform in a toolchain file d506fee8 Tests: Use -A option to pass generator platform selection 11c9ddd6 ExternalProject: Use -A option to pass generator platform 29bd843e CTest: Use -A option to pass generator platform selection eb7d8156 cmake: Add -A option to specify a generator platform
| * | | | | | | | | | ExternalProject: Use -A option to pass generator platformBrad King2014-09-151-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is less verbose than defining CMAKE_GENERATOR_PLATFORM.
* | | | | | | | | | | Merge topic 'if-sanity'Brad King2014-09-156-6/+6
|\ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 858d5a0b Fix if() checks of CMAKE_SYSTEM_NAME on Cygwin e177e7af FPHSA: Avoid if() dereferencing of quoted variable 425acc52 cmcurl: Use if(DEFINED) to simplify conditions cede5cbd libarchive: Avoid depending on if() to dereference a quoted variable 2d97178b FindGTK2: Avoid depending on if() to dereference a quoted variable 0b12815d Modules/Test*.cmake: Use if(DEFINED) to simplify conditions 188a1f23 If: Introduce policy CMP0054 - don't dereference quoted variables in if() b900c1cc If: Extract cmConditionEvaluator from if() implementation
| * | | | | | | | | | FPHSA: Avoid if() dereferencing of quoted variableBrad King2014-09-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Legacy invocations may pass a variable name where "DEFAULT_MSG" belongs. When comparing FPHSA_FAIL_MESSAGE to "DEFAULT_MSG", use a leading "x" on both sides to avoid mistaking the value of the message for a variable name.
| * | | | | | | | | | FindGTK2: Avoid depending on if() to dereference a quoted variableBrad King2014-09-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Explicitly dereference GTK2_${_var}CONFIG_INCLUDE_DIR and GTK2_${_var}_INCLUDE_DIR when comparing their values.
| * | | | | | | | | | Modules/Test*.cmake: Use if(DEFINED) to simplify conditionsBrad King2014-09-114-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replace old hacks of the form 'if("${VAR}" MATCHES "^${VAR}$")' with the much simpler 'if(NOT DEFINED ${VAR})'.
* | | | | | | | | | | Merge topic 'doc-check-results-cached'Brad King2014-09-1116-1/+18
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 908c7439 Help: Document that the CHECK_* macros create cache variables
| * | | | | | | | | | | Help: Document that the CHECK_* macros create cache variablesSebastian Leske2014-09-1116-1/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Otherwise callers may expect to be able to re-use result variables.
* | | | | | | | | | | | Merge topic 'fix-gnu-hurd-host-detection'Brad King2014-09-111-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 89d7a5a4 Fix CMAKE_HOST_SYSTEM_PROCESSOR detection on GNU/Hurd (#15147)
| * | | | | | | | | | | Fix CMAKE_HOST_SYSTEM_PROCESSOR detection on GNU/Hurd (#15147)Felix Geyer2014-09-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On Debian GNU/Hurd 'uname -p' prints "unknown", so use 'uname -m' instead.
* | | | | | | | | | | | Merge topic 'vs-generator-platform'Brad King2014-09-101-0/+11
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 09c8ad99 enable_language: Initialize system-specific generator info only once 09ab207c Tests: Add generator platform support 6944997b ExternalProject: Propagate the generator platform 8d332091 CTest: Add options to set generator platform b97736a2 VS: Implement CMAKE_GENERATOR_PLATFORM for VS >= 8 0f1f1271 CMake: Add CMAKE_GENERATOR_PLATFORM option 4f7d0c42 Help: Document CMAKE_VS_PLATFORM_NAME variable 68d4280a VS: Refactor internal default platform name selection ad2a4776 cmGlobalVisualStudio10Generator: Re-order some methods 03b7b6cd cmGlobalGenerator: Call SetGeneratorToolset even for empty toolset
| * | | | | | | | | | | ExternalProject: Propagate the generator platformBrad King2014-09-051-0/+11
| | |/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the CMAKE_GENERATOR option is given to ExternalProject_Add, look also for option CMAKE_GENERATOR_PLATFORM to pass on to cmake as a cache definition. When no CMAKE_GENERATOR option is given explicitly then use the current project's CMAKE_GENERATOR_PLATFORM (since we already use its CMAKE_GENERATOR).
* | | | | | | | | | | Merge topic 'FindIce-updates'Brad King2014-09-101-18/+15
|\ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2131aedd FindIce: Respect Ice_FIND_QUIETLY when printing messages d5047ca1 FindIce: Remove unneeded search path modification
| * | | | | | | | | | FindIce: Respect Ice_FIND_QUIETLY when printing messagesRoger Leigh2014-09-091-12/+16
| | | | | | | | | | |
| * | | | | | | | | | FindIce: Remove unneeded search path modificationRoger Leigh2014-09-091-7/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Drop code adding redundant "/opt/Ice-${ice_version}" paths.
* | | | | | | | | | | Merge topic 'use-consistent-regex-for-info-strings'Brad King2014-09-093-3/+3
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3e84e78c Use a more reliable regex for extracting binary INFO strings
| * | | | | | | | | | | Use a more reliable regex for extracting binary INFO stringsChuck Atkins2014-09-033-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A few different regular expressions were being used in various places to extract info strings from binaries. This uses a consistent regex amongst all of them now. This also fixes the broken ABI detection for Cray compilers.
* | | | | | | | | | | | Merge topic 'ExternalProject-download-loop'Brad King2014-09-091-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9f49ac3d ExternalProject: Avoid infinite loop on file download hash mismatch
| * | | | | | | | | | | ExternalProject: Avoid infinite loop on file download hash mismatchAlan W. Irwin2014-09-081-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the loop was added by commit v3.0.0-rc1~103^2~3 (ExternalProject: Reattempt download when verification fails, 2015-01-15), we forgot to actually increment the loop counter. Add the increment line.