summaryrefslogtreecommitdiffstats
path: root/Modules
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'GetPrerequisites-more-dumpbin-paths'Brad King2016-04-111-0/+11
|\ | | | | | | | | | | a1c40291 GetPrerequisites: Look for VS tools using environment variables c79f88b0 GetPrerequisites: add path of VS 10,11,12,14 in order to find dumpbin.exe
| * GetPrerequisites: Look for VS tools using environment variablesBrad King2016-04-081-0/+7
| | | | | | | | | | | | The `VS*COMNTOOLS` environment variables specify locations of VS tools and are set during the VS installation. Use them in addition to the hard-coded default install locations.
| * GetPrerequisites: add path of VS 10,11,12,14 in order to find dumpbin.exeFARBOS Arnaud2016-04-081-0/+4
| |
* | MSVC: Drop space in `/DNDEBUG` flag for consistency (#16052)Brad King2016-04-072-9/+9
|/ | | | | | | | We define `NDEBUG` without a space after the `-D` option for most compilers. Remove the space for MSVC (and Intel Fortran) for consistency. The MS compiler technically does not document that the `-D` argument may be separated from its value, though every version to date supports it.
* Merge topic 'branch_coverage_working_dir'Brad King2016-04-071-2/+2
|\ | | | | | | | | c5ff34cc CTestCoverageCollectGCOV: specify base dir for GLOB_RECURSE
| * CTestCoverageCollectGCOV: specify base dir for GLOB_RECURSEZack Galbreath2016-04-041-2/+2
| | | | | | | | | | | | Consistently glob for .gcda files in the binary directory. Previously the behavior of this function depended on the current working directory that it was called from.
* | Merge topic 'branch_coverage_glob'Brad King2016-04-071-8/+70
|\ \ | | | | | | | | | | | | | | | 8ea1b0df CTestCoverageCollectGCOV: Improve documentation 425d7646 CTestCoverageCollectGCOV: Honor CTEST_EXTRA_COVERAGE_GLOB
| * | CTestCoverageCollectGCOV: Improve documentationZack Galbreath2016-04-071-8/+13
| | | | | | | | | | | | Clean up prose and mention support for CTEST_EXTRA_COVERAGE_GLOB.
| * | CTestCoverageCollectGCOV: Honor CTEST_EXTRA_COVERAGE_GLOBZack Galbreath2016-04-071-0/+57
| | | | | | | | | | | | | | | | | | | | | Teach CTestCoverageCollectGCOV to honor the CTEST_EXTRA_COVERAGE_GLOB variable. When this variable is set, this module will glob for matching source files that were not covered and include them in the resulting tar file.
* | | Merge topic 'UseJava-cmake-command'Brad King2016-04-071-1/+1
|\ \ \ | | | | | | | | | | | | | | | | fa382ae8 UseJava: use CMAKE_COMMAND instead of direct cmake call
| * | | UseJava: use CMAKE_COMMAND instead of direct cmake callBrad King2016-04-061-1/+1
| | | | | | | | | | | | | | | | Author: dancing-leaves <dancing-leaves@users.noreply.github.com>
* | | | Merge topic 'ExternalProject-TLS_VERIFY-fixes'Brad King2016-04-071-10/+16
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | 4d8c988c ExternalProject: Fix file download script with CMAKE_TLS_{VERIFY,CAINFO} 23a71e4e ExternalProject: Tell Git not to verify certs only if TLS_VERIFY is OFF
| * | | ExternalProject: Fix file download script with CMAKE_TLS_{VERIFY,CAINFO}Brad King2016-04-061-6/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Avoid generating incorrect code such as set(CMAKE_TLS_VERIFY set(CMAKE_TLS_VERIFY 1)) when one of these variables is set in the calling project.
| * | | ExternalProject: Tell Git not to verify certs only if TLS_VERIFY is OFFBrad King2016-04-061-4/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit 272779ce (ExternalProject: Allow TLS_VERIFY for git clones, 2016-04-01) we pass the `-c http.sslVerify=false` option to `git clone` even if no explicit `TLS_VERIFY` option was set. This changes behavior because we used to use the default Git behavior by default. Revise the logic to preserve the old default behavior by passing the new option only if `TLS_VERIFY` was explicitly passed as `OFF`. While at it, also honor `CMAKE_TLS_VERIFY` if the explicit `TLS_VERIFY` option is not given.
* | | | Merge topic 'FindOpenSSL-names-per-dir'Brad King2016-04-061-0/+10
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | b1484403 FindOpenSSL: Prefer libs early in search path regardless of name (#15887)
| * | | | FindOpenSSL: Prefer libs early in search path regardless of name (#15887)Hannes Mezger2016-04-051-0/+10
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | Add NAMES_PER_DIR to all find_library invocations so that we consider all possible names in each search directory before moving on to the next directory. Otherwise we may not find self-built libraries first even if they appear early in the search path.
* | | | Merge topic 'mingw-w64-Fortran-platform'Brad King2016-04-061-6/+20
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | 8c4f100a Fortran: Fix platform id detection on mingw-w64 66fa6143 CMakeDetermineFortranCompiler: Modernize conventions
| * | | | Fortran: Fix platform id detection on mingw-w64Melven Roehrig-Zoellner2016-04-051-0/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On mingw-w64 the GNU Fortran compiler does not define `__MINGW32__` or any similar indicator. Fix `CMAKE_Fortran_PLATFORM_ID` detection in this case by falling back to preprocessing a `.c` source file even when the compiler id is already detected.
| * | | | CMakeDetermineFortranCompiler: Modernize conventionsMelven Roehrig-Zoellner2016-04-051-6/+5
| | | | | | | | | | | | | | | | | | | | Suggested-by: Ben Boeckel <ben.boeckel@kitware.com>
* | | | | Merge topic 'FindGSL-doc-typo'Brad King2016-04-061-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 2308764b FindGSL: Fix typo in documentation
| * | | | | FindGSL: Fix typo in documentationPierrick Koch2016-04-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | s/GSL_CLBAS_LIBRARY/GSL_CBLAS_LIBRARY/
* | | | | | Merge topic 'find-blas-lapack-Fortran-only'Brad King2016-04-062-14/+18
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | | | | | | | | | | | | 1694112d Find{BLAS,LAPACK}: Fix when used in pure Fortran projects (#16039)
| * | | | | Find{BLAS,LAPACK}: Fix when used in pure Fortran projects (#16039)Melven Roehrig-Zoellner2016-04-052-14/+18
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | Use `CMAKE_<LANG>_COMPILER_LOADED` to detect enabled languages because `if( _LANGUAGES_ MATCHES C )` is always true on Windows as the RC language is activated automatically and matches C.
* | | | | Merge topic 'ctest-run-submodule-sync'Brad King2016-04-051-0/+1
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | c18d91ad Help: add release notes for topic 'ctest-run-submodule-sync' 7f560743 cmCTestGIT: run `git submodule sync` before updating submodules 06b310b5 cmCTestGIT: add an option to initialize submodules on update 56c1ea40 cmCTestGIT: fix git version references
| * | | | cmCTestGIT: add an option to initialize submodules on updateBen Boeckel2016-04-011-0/+1
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | Currently, CTest will not initialize any submodules within the already checked out source tree. Add an option to do so. The use case for not doing so is that some submodules may not be necessary for the current test and keeping network usage down may be important.
* | | | ExternalProject: Allow TLS_VERIFY for git clonesSamir Benmendil2016-04-011-6/+17
| |/ / |/| | | | | | | | | | | Use the git config `http.sslVerify=false` to disable strict ssl for git commands.
* | | Merge topic 'cpack-rpm-external-symlink-handling'Brad King2016-04-011-7/+23
|\ \ \ | | | | | | | | | | | | | | | | eae4eef0 CPack/RPM external symlink handling
| * | | CPack/RPM external symlink handlingDomen Vrankar2016-04-011-7/+23
| |/ / | | | | | | | | | | | | | | | | | | | | | Symbolic links that point to external location no longer cause cmake to fail with string out of bounds error but are instead packaged as non relocatable symlinks and print out a warning message.
* | | Merge topic 'check-compiler-flag-clang-cl'Brad King2016-04-011-0/+1
|\ \ \ | | | | | | | | | | | | | | | | fae80ee2 Check*CompilerFlag: Add another pattern for Clang (#16038)
| * | | Check*CompilerFlag: Add another pattern for Clang (#16038)Brad King2016-03-311-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | Match a warning pattern produced by `clang-cl`. Suggested-by: Reid Kleckner <rnk@google.com>
* | | | CMakePushCheckState: Add support for CMAKE_EXTRA_INCLUDE_FILESJean-Christophe Fillion-Robin2016-03-311-2/+5
|/ / / | | | | | | | | | | | | This commit teaches the module to push/pop/reset state of variable CMAKE_EXTRA_INCLUDE_FILES used in CheckTypeSize module.
* | | Merge topic 'fix-spelling-typos'Brad King2016-03-3116-27/+27
|\ \ \ | | | | | | | | | | | | | | | | 49e82c15 Fix spelling typos in comments and documentation (#16037)
| * | | Fix spelling typos in comments and documentation (#16037)Felix Geyer2016-03-2916-27/+27
| |/ / | | | | | | | | | | | | The Debian package checker tool (lintian) detected several typos in CMake.
* | | ExternalProject: add support for just downloading a fileBen Boeckel2016-03-311-6/+26
|/ / | | | | | | | | | | Some projects only ship self-extracting installers rather than compressed archives. Add a flag so that these files may be used in ExternalProject.
* | Merge topic 'asm-includes'Brad King2016-03-295-5/+5
|\ \ | | | | | | | | | | | | 9408a7a8 ASM: Add missing <INCLUDES> placeholder for "compile" rules
| * | ASM: Add missing <INCLUDES> placeholder for "compile" rulesGregor Jasny2016-03-295-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | This placeholder was added to the compilation rules for other languages by commit v3.4.0-rc1~342^2 (Factor an <INCLUDES> placeholder out of <FLAGS> in rule variables, 2015-07-13) but ASM was incorrectly left out. Signed-off-by: Gregor Jasny <gjasny@googlemail.com>
* | | Merge topic 'ghs-link-flags'Brad King2016-03-293-4/+12
|\ \ \ | | | | | | | | | | | | | | | | | | | | 36ad8dd4 GHS: Implement link flags and dirs for non-target groups (#16029) 230d50ed GHS: Factor out compiler information shared among languages
| * | | GHS: Implement link flags and dirs for non-target groups (#16029)Geoff Viola2016-03-281-0/+2
| | | |
| * | | GHS: Factor out compiler information shared among languagesGeoff Viola2016-03-283-4/+10
| | | | | | | | | | | | | | | | | | | | Move common information in `Modules/Compiler/GHS-*.cmake` over to a common `Modules/Compiler/GHS.cmake` and include it.
* | | | cpack rpm setting of defattrDomen Vrankar2016-03-281-1/+102
|/ / / | | | | | | | | | | | | | | | | | | | | | RPM supports setting of default user, group, file and directory permissions that will be applied for files in package unless specified per file/dir with attr setting This is related to bug report 14714
* | | Merge topic 'xcode73-xctest-location'Brad King2016-03-281-0/+4
|\ \ \ | |/ / |/| | | | | | | | a364d251 Xcode: Fixup XCTest bundle location for Xcode 7.3
| * | Xcode: Fixup XCTest bundle location for Xcode 7.3Gregor Jasny2016-03-281-0/+4
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prior to Xcode 7.3 a XCTest bundle was built like an ordinary bundle. But starting with Xcode 7.3 it is implicitely built as a plugin for the test host. It looks like in that case the 'Build Products Path' is ignored. This patch simply sets the CMake target output path to the value Xcode expects internally to get a matching view of both. The command: xcodebuild -showBuildSettings -target CocoaExampleTests -configuration Debug Output with Xcode 7.2: TARGET_BUILD_DIR = .../Tests/XCTest/Debug Output with Xcode 7.3 TARGET_BUILD_DIR = .../Tests/XCTest/Debug/CocoaExample.app/Contents/PlugIns Signed-off-by: Gregor Jasny <gjasny@googlemail.com>
| * Merge branch 'FindCUDA-verbatim' into releaseBrad King2016-03-221-1/+6
| |\
| * \ Merge branch 'fix-repeat-pkg-config' into releaseBrad King2016-03-211-1/+1
| |\ \
| * \ \ Merge branch 'ios-install-combined-one-arch' into releaseBrad King2016-03-151-1/+11
| |\ \ \
* | \ \ \ Merge topic 'cpackcomponents-priv-var'Brad King2016-03-251-22/+22
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | c70ac097 CPack: Exclude additional internal variables from CPackConfig.cmake
| * | | | | CPack: Exclude additional internal variables from CPackConfig.cmakeNils Gladitz2016-03-241-22/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In v2.8.12.1-654-g7621ad6 I added underscore prefixes to CPACK_ADDCOMP_(STR|UNAME) to prevent them from being automatically written to CPackConfig.cmake. Do the same for CPACK_ADDGRP_(STR|UNAME) and CPACK_INSTTYPE_(STR|UNAME).
* | | | | | Merge topic 'FindBoost-xl-compiler'Brad King2016-03-241-0/+2
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | 4527b9c4 FindBoost: Add support for IBM XL compiler
| * | | | | FindBoost: Add support for IBM XL compilerErik Zenker2016-03-231-0/+2
| | | | | |
* | | | | | Merge topic 'CMakePackageConfigHelpers-relative-prefix'Brad King2016-03-231-1/+3
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | fd31feb0 CMakePackageConfigHelpers: allow to specify a relative CMAKE_INSTALL_PREFIX