summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'preallocate-condition-keywords'Brad King2016-04-111-4/+4
|\ | | | | | | | | aff4a5fa cmConditionEvaluator: Use pre-allocated keywords in more places
| * cmConditionEvaluator: Use pre-allocated keywords in more placesBrad King2016-04-081-4/+4
| | | | | | | | Inspired-by: Harry Mallon <Harry@codexdigital.com>
* | 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
| | |
* | | CMake Nightly Date StampKitware Robot2016-04-111-1/+1
| | |
* | | CMake Nightly Date StampKitware Robot2016-04-101-1/+1
| | |
* | | CMake Nightly Date StampKitware Robot2016-04-091-1/+1
| | |
* | | Merge branch 'release'Brad King2016-04-080-0/+0
|\ \ \
| * \ \ Merge branch 'ninja-restat-custom-command-byproducts' into releaseBrad King2016-04-053-2/+31
| |\ \ \
| * \ \ \ Merge branch 'fortran-line-directives-no-dirs' into releaseBrad King2016-04-051-1/+1
| |\ \ \ \
| * \ \ \ \ Merge branch 'FindGSL-doc-typo' into releaseBrad King2016-04-051-1/+1
| |\ \ \ \ \
* | \ \ \ \ \ Merge topic 'ninja-restat-custom-command-byproducts'Brad King2016-04-083-2/+31
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | add7abc8 Ninja: Restat custom command byproducts even with a SYMBOLIC output (#16049) ff805113 Ninja: Fix detection of custom command symbolic outputs
| * | | | | | Ninja: Restat custom command byproducts even with a SYMBOLIC output (#16049)Brad King2016-04-053-1/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The change in commit v3.5.0-rc1~198^2 (Ninja: Always re-run custom commands that have symbolic dependencies, 2015-11-19) broke the byproducts feature added by commit v3.2.0-rc1~340^2~2 (Add an option for explicit BYPRODUCTS of custom commands, 2014-11-13) when SYMBOLIC outputs also appear. This case occurs with AUTORCC-generated custom targets because the output is SYMBOLIC (to always run) and the generated file is a byproduct (for restat so dependents do not run unnecessarily). The two use cases conflict because Ninja does not support per-output restat. Favor restat whenever byproducts are present because it is required for byproducts to work correctly. In use cases where we want an always-run chain we simply will not be able to also use byproducts.
| * | | | | | Ninja: Fix detection of custom command symbolic outputsBrad King2016-04-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix logic introduced by commit v3.5.0-rc1~198^2 (Ninja: Always re-run custom commands that have symbolic dependencies, 2015-11-19) to not consider only the last output. We need to know if any output is SYMBOLIC, so stop checking as soon as one is found.
* | | | | | | Merge topic 'drop-DNDEBUG-space'Brad King2016-04-082-9/+9
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e888af97 MSVC: Drop space in `/DNDEBUG` flag for consistency (#16052)
| * | | | | | | 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 'ninja-object-rsp'Brad King2016-04-085-12/+40
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7731e44f Ninja: Honor CMAKE_NINJA_FORCE_RESPONSE_FILE for compile rules f9644a2d cmGlobalNinjaGenerator: Clarify logic for forcing use of response files 24c9106b cmNinjaTargetGenerator: Factor out helper for forced response file check
| * | | | | | | Ninja: Honor CMAKE_NINJA_FORCE_RESPONSE_FILE for compile rulesDmitry Ivanov2016-04-071-4/+24
| | | | | | | |
| * | | | | | | cmGlobalNinjaGenerator: Clarify logic for forcing use of response filesDmitry Ivanov2016-04-073-5/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update the WriteBuild method to use a negative command line length limit to specify that we should force use of response files.
| * | | | | | | cmNinjaTargetGenerator: Factor out helper for forced response file checkDmitry Ivanov2016-04-073-3/+10
| |/ / / / / /
* | | | | | | CMake Nightly Date StampKitware Robot2016-04-081-1/+1
|/ / / / / /
* | | | | | 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-074-8/+74
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-074-0/+61
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | | | | | | CMake Nightly Date StampKitware Robot2016-04-071-1/+1
| |/ / / / / / / / |/| | | | | | | |
* | | | | | | | | Merge topic 'fortran-line-directives-no-dirs'Brad King2016-04-061-1/+1
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | f831d752 cmFortranParser: Skip #line directives that do not name files
| * | | | | | | | cmFortranParser: Skip #line directives that do not name filesBrad King2016-04-051-1/+1
| | |_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit v3.5.0-rc1~241^2~1 (cmFortranParser: Parse #line directives, 2015-11-02) our Fortran dependency scanner parses `#line` directives to extract the named files. However, some compilers produce `#line` directives that name directories instead of files. Work around such cases by verifying that the extracted path names a file and not a directory.
* | | | | | | | 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.
* | | | | | | | | CMake Nightly Date StampKitware Robot2016-04-061-1/+1
| |_|/ / / / / / |/| | | | | | |
* | | | | | | | Merge branch 'release'Brad King2016-04-050-0/+0
|\ \ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | |
| * | | | | | | Merge branch 'fix-target-alias-in-subdir' into releaseBrad King2016-04-018-33/+15
| |\ \ \ \ \ \ \
* | \ \ \ \ \ \ \ Merge topic 'ctest-run-submodule-sync'Brad King2016-04-057-4/+67
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | | | | Help: add release notes for topic 'ctest-run-submodule-sync'Ben Boeckel2016-04-011-0/+9
| | | | | | | | | |
| * | | | | | | | | cmCTestGIT: run `git submodule sync` before updating submodulesBen Boeckel2016-04-011-0/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the URL of a submodule changes upstream, the commits referenced at the old URL may not be available and will cause an update failure.