summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Tests/Module/WCDH: only use -Werror=undef compiler flag if actually supportedRolf Eike Beer2017-02-021-1/+5
|
* Tests/Module/WCDH: write multi_file_compiler_detection.h before using itRolf Eike Beer2017-02-021-11/+11
| | | | | | | | This was broken in commit 98e6d1e5e426c491e04faa746c11746002e6a69d (Tests/Module/WCDH: make it work with only C features defined) when all C tests were made accessible even if no C++ features are available, but the header was only created if C++ features are available. Fix it by creating the header unconditionally before any checks on the available features.
* Merge topic 'find_cuda_fix_typo'Brad King2017-02-021-1/+1
|\ | | | | | | | | 645dd3ca FindCUDA: Fix typo in CUDA_DETECT_INSTALLED_GPUS doc string
| * FindCUDA: Fix typo in CUDA_DETECT_INSTALLED_GPUS doc stringPierre Moreau2017-02-021-1/+1
| |
* | Merge topic 'doc-compile-features-fixup'Brad King2017-02-021-2/+2
|\ \ | | | | | | | | | | | | be3727bf Help: Fix language standard link text in cmake-compile-features(7)
| * | Help: Fix language standard link text in cmake-compile-features(7)Brad King2017-02-021-2/+2
|/ / | | | | | | | | Include each language name in the text of the link to its standards property.
* | Merge topic 'FindGSL-regex-fixup'Brad King2017-02-021-1/+1
|\ \ | |/ |/| | | | | 88c4576b FindGSL: Fix gl_version.h extraction regex
| * FindGSL: Fix gl_version.h extraction regexIgor Peschinskiy2017-02-011-1/+1
| | | | | | | | Fix the regex to match versions with only two digits, such as `2.3`.
* | CMake Nightly Date StampKitware Robot2017-02-021-1/+1
| |
* | Merge branch 'release-3.7'Brad King2017-02-010-0/+0
|\ \
| * \ Merge branch 'case-insensitive-bindir-detection' into releaseBrad King2017-01-201-1/+2
| |\ \
* | \ \ Merge branch 'release-3.7'Brad King2017-02-010-0/+0
|\ \ \ \ | |/ / /
* | | | Merge topic 'WCDH_allow_unsupported'Brad King2017-02-014-139/+137
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1679fecb CompileFeatures Test: make sure the target "CompileFeatures" is always defined 98e6d1e5 Tests/Module/WCDH: make it work with only C features defined c8703e9d WCDH: optionally omit error code for unknown compilers or compiler versions 0de9c398 WCDH: add macro to write simple replacement defines
| * | | | CompileFeatures Test: make sure the target "CompileFeatures" is always definedRolf Eike Beer2017-01-301-10/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Everything in there guards against unsupported compilers already, so no need to skip the whole file if no features are defined. This in turn allows to have a simpler fallback in case there is no C++ auto_type feature available.
| * | | | Tests/Module/WCDH: make it work with only C features definedRolf Eike Beer2017-01-301-51/+51
| | | | |
| * | | | WCDH: optionally omit error code for unknown compilers or compiler versionsRolf Eike Beer2017-01-303-11/+61
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows one to generate a header that will basically always work. In case an unknown compiler or compiler version is encountered it simply falls back to the unsupported case.
| * | | | WCDH: add macro to write simple replacement definesRolf Eike Beer2017-01-301-70/+20
| | | | |
* | | | | Merge topic 'FortranCInterface-vs-intel-workaround'Brad King2017-02-012-2/+4
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | c9ee05d8 FortranCInterface: Fix support for VS with Intel toolset
| * | | | | FortranCInterface: Fix support for VS with Intel toolsetBrad King2017-02-012-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When using a Visual Studio generator with an Intel toolset, such as -T "Intel C++ Compiler XE 14.0" the generated FortranCInterface mangling detection project may fail to build due to `devenv` not working with the `/project ALL_BUILD` option. This seems to be a bug in `devenv` or the Intel VS integration. Work around the problem by building with `/project FortranCInterface` instead. We only need to build this executable and its dependencies within the detection test project anyway. Fixes: #16519
* | | | | | Merge topic 'intel-c11-windows'Brad King2017-02-011-5/+8
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5d70894d Features: Update version of Intel Compiler on Windows supporting C 11
| * | | | | | Features: Update version of Intel Compiler on Windows supporting C 11Brad King2017-02-011-5/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Intel Compiler 15.0.0 on Windows does not support `-Qstd=c11`. Bump our version requirement to 16 to use that flag.
* | | | | | | Merge topic 'doc-cmake-packages-typo'Brad King2017-02-011-2/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f3619bbc Help: Fix typo in <pkg>_NOT_FOUND_MESSAGE example in cmake-packages(7)
| * | | | | | | Help: Fix typo in <pkg>_NOT_FOUND_MESSAGE example in cmake-packages(7)Brad King2017-02-011-2/+2
| | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | Fixes: #16616
* | | | | | | Merge topic 'doc-cmake-developer-purpose'Brad King2017-02-011-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9f3e812f Help: Extend documented purpose of cmake-developer(7) manual
| * | | | | | | Help: Extend documented purpose of cmake-developer(7) manualBrad King2017-02-011-1/+1
| | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | Issue: #16616
* | | | | | | Merge topic 'developer-setup'Brad King2017-02-013-3/+21
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | 3288ab0c Convert local hook configuration to a Git config file format 773df0e2 Add pre-commit hook to check whether SetupForDevelopment must re-run
| * | | | | | Convert local hook configuration to a Git config file formatBrad King2017-01-311-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The `git config` format is cleaner than a bash script and is also supported by our `hooks` branch to specify CMake-specific hooks.
| * | | | | | Add pre-commit hook to check whether SetupForDevelopment must re-runBrad King2017-01-312-0/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a version number to the `SetupForDevelopment.sh` script and use a pre-commit hook to check when it changes.
* | | | | | | CMake Nightly Date StampKitware Robot2017-02-011-1/+1
| |/ / / / / |/| | | | |
* | | | | | Merge topic 'CSharpVS2017'Brad King2017-01-311-4/+4
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 435cebaa VS: Fix CSharp compiler identification for VS 2017
| * | | | | | VS: Fix CSharp compiler identification for VS 2017Gilles Khouzam2017-01-311-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The CSharp compiler for VS 2017 has moved from `MSBuildTools` to `RoslynTargets`. Account for both locations giving priority to the `MSBuildTools` location.
* | | | | | | Merge topic 'FindBoost-cache-unset-on-change'Brad King2017-01-311-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 97d61562 FindBoost: unset cache variables if the lib dir changes
| * | | | | | | FindBoost: unset cache variables if the lib dir changesYves Frederix2017-01-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes a regression introduced by commit v3.3.0-rc1~5^2~2 (FindBoost: Search for debug and release libraries separately, 2015-01-26). The `_Boost_CHANGE_LIBDIR` variable was split into `_Boost_CHANGE_LIBDIR_{DEBUG,RELEASE}` but one usage site was not updated.
* | | | | | | | Merge topic 'topic-reproducible-build'Brad King2017-01-312-0/+2
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5181f1f8 Tests: make tests pass with SOURCE_DATE_EPOCH set
| * | | | | | | | Tests: make tests pass with SOURCE_DATE_EPOCH setBernhard M. Wiedemann2017-01-302-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix tests to account for commit 243aed52 (cmTimestamp: Support SOURCE_DATE_EPOCH to override current time, 2017-01-25). In openSUSE we are running the test-suite as part of the build and that failed in these two places when building everything with `SOURCE_DATE_EPOCH` set.
* | | | | | | | | Merge topic 'vs-export-external-objects'Brad King2017-01-311-0/+8
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4dde0bc8 VS: Fix WINDOWS_EXPORT_ALL_SYMBOLS for external objects
| * | | | | | | | | VS: Fix WINDOWS_EXPORT_ALL_SYMBOLS for external objectsZsolt Parragi2017-01-301-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Teach Visual Studio generators to include external object files in the list of objects whose symbols are to be exported. The Makefile and Ninja generators already did this.
* | | | | | | | | | Merge topic '16432-static-frameworks'Brad King2017-01-3117-109/+211
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 071f8e78 Apple: Add support for static frameworks d525754e Xcode: Refactor RunCMake.Framework test to prepare for static frameworks 45405f00 Xcode: Ignore Xcode project warning until issue is fixed 50e1c105 Makefile: For static libraries remove only the "real" lib before creating 8643ca75 Makefile: Re-order list of files to clean
| * | | | | | | | | Apple: Add support for static frameworksGregor Jasny2017-01-3114-62/+178
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes: #16432
| * | | | | | | | | Xcode: Refactor RunCMake.Framework test to prepare for static frameworksGregor Jasny2017-01-262-33/+18
| | | | | | | | | |
| * | | | | | | | | Xcode: Ignore Xcode project warning until issue is fixedGregor Jasny2017-01-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Issue: #15272
| * | | | | | | | | Makefile: For static libraries remove only the "real" lib before creatingGregor Jasny2017-01-261-13/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When creating a static library with the archive tool, only the `.a` needs to be removed to start a fresh archive. Any other files (e.g. symbolic links we may later add) are not managed by the archive tool and therefore do not need to be cleaned.
| * | | | | | | | | Makefile: Re-order list of files to cleanGregor Jasny2017-01-261-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revise construction of the list of files to be cleaned for the target to list the "real" file first.
* | | | | | | | | | Merge topic 'developer-setup'Brad King2017-01-3112-11/+552
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 050bb41c Tell Git not to export the GitSetup directory d6108c87 GitSetup: Tell Git not to export .gitattributes 3642d657 Merge branch 'upstream-GitSetup' into developer-setup 7e5ef9ca GitSetup 2016-12-13 (cd5ada6d) a6fda7bf Merge branch 'upstream-GitSetup' into developer-setup a2d393d6 Add script to update GitSetup from upstream c7b846ed GitSetup 2012-04-26 (b7daff9b)
| * | | | | | | | | Tell Git not to export the GitSetup directoryBrad King2017-01-301-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The `Utilities/GitSetup` directory is useful only in Git work trees and so does not need to be distributed with source tarballs.
| * | | | | | | | | GitSetup: Tell Git not to export .gitattributesBrad King2017-01-301-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | GitSetup upstream added an attribute to export `.gitattributes` so that importing snapshots into the sources of other projects would bring along the attributes. However, we don't want to export them from CMake. Drop `.gitattributes` entries not relevant to CMake.
| * | | | | | | | | Merge branch 'upstream-GitSetup' into developer-setupBrad King2017-01-3010-11/+532
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream-GitSetup: GitSetup 2016-12-13 (cd5ada6d)
| | * | | | | | | | | GitSetup 2016-12-13 (cd5ada6d)GitSetup Upstream2017-01-3010-11/+532
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Code extracted from: https://gitlab.kitware.com/utils/gitsetup.git at commit cd5ada6d5626da409d3ff108c341b9afd615803f (setup).
| * | | | | | | | | | Merge branch 'upstream-GitSetup' into developer-setupBrad King2017-01-300-0/+0
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / /
| | * | | | | | | | | GitSetup 2012-04-26 (b7daff9b)GitSetup Upstream2017-01-3011-0/+805
| | / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Code extracted from: https://gitlab.kitware.com/utils/gitsetup.git at commit b7daff9b8b776eeed34385d8ae2019dc9e113c52 (setup).