summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'vs-2017-sln-guid'Brad King2017-07-1213-12/+37
|\ | | | | | | | | | | | | 5cf9c3d0 VS: Add SolutionGuid to generated .sln files Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1042
| * VS: Add SolutionGuid to generated .sln filesBrad King2017-07-1113-12/+37
| | | | | | | | | | | | Visual Studio 2017 Update 3 adds a SolutionGuid to its `.sln` files. Fixes: #17041
* | Merge topic 'find_package-root-prefix-path-suffixes'Brad King2017-07-1211-18/+75
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | 80b905f8 find_*: Honor PATH_SUFFIXES in PackageName_ROOT paths 1ae1b880 cmFindCommon: Drop unused FilterPaths method cca8454e cmFindCommon: Fix typo in PackageName_ROOT path label Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Chuck Atkins <chuck.atkins@kitware.com> Merge-request: !1044
| * | find_*: Honor PATH_SUFFIXES in PackageName_ROOT pathsBrad King2017-07-119-0/+74
| | | | | | | | | | | | | | | | | | | | | This was accidentally forgotten in commit v3.9.0-rc1~71^2~2 (find_*: Add a new PackageRoot search path group, 2017-05-03). Fixes: #17052
| * | cmFindCommon: Drop unused FilterPaths methodBrad King2017-07-112-17/+0
| | | | | | | | | | | | | | | | | | The method has not been used since commit v3.2.0-rc1~400^2~1 (Encapsulate search path manipulation functions into a seperate class, 2014-10-15).
| * | cmFindCommon: Fix typo in PackageName_ROOT path labelBrad King2017-07-111-1/+1
| |/
* | Merge topic 'bindexplib-revert-consts'Brad King2017-07-123-22/+12
|\ \ | | | | | | | | | | | | | | | | | | 3250b9a1 bindexplib: Revert support for constants symbols Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1041
| * | bindexplib: Revert support for constants symbolsBrad King2017-07-103-22/+12
| |/ | | | | | | | | | | | | | | | | | | Revert the main logic change of commit v3.9.0-rc1~192^2 (bindexplib: fix constants symbols export, 2017-04-26) and its test case. Unfortunately some constants may be provided by multiple object files with different `@...` suffixes, leading to ambiguous references. Revert support pending further investigation. Fixes: #17045
* | CMake Nightly Date StampKitware Robot2017-07-121-1/+1
| |
* | Merge branch 'release-3.9'Brad King2017-07-110-0/+0
|\ \
| * \ Merge branch 'vs-2017-choose-via-environment' into release-3.9Brad King2017-07-102-0/+40
| |\ \
| * \ \ Merge branch 'autogen_skip_included' into release-3.9Brad King2017-07-101-28/+33
| |\ \ \
* | \ \ \ Merge topic 'FindMFC-try-static'Brad King2017-07-112-0/+16
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6b2bf575 FindMFC: Check for static MFC variant Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1034
| * | | | | FindMFC: Check for static MFC variantRich Chiodo2017-07-062-0/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some CMake applications can set /MT without setting CMAKE_MFC_FLAG. This change lets FindMFC work in those situations.
* | | | | | Merge topic 'file-LOCK-windows-message'Brad King2017-07-111-12/+7
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | efaf987a cmFileLockResult: Avoid allocation for Windows error message Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1035
| * | | | | | cmFileLockResult: Avoid allocation for Windows error messageIyyappa Murugandi2017-07-071-12/+7
| |/ / / / /
* | | | | | Merge topic 'vs-2017-choose-via-environment'Brad King2017-07-112-0/+40
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | 2644e4c9 VS: Choose VS 2017 instance via environment variable Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1030
| * | | | | VS: Choose VS 2017 instance via environment variableBrad King2017-07-102-0/+40
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In the `Visual Studio 15 2017` generator, if the `VS150COMNTOOLS` environment variable points at a specific VS 2017 instance reported by the Visual Studio Installer tool, use that as the preferred instance. Inspired-by: Iyyappa Murugandi <iyyappam@microsoft.com> Fixes: #16846
* | | | | Merge topic 'autogen_skip_included'Brad King2017-07-111-28/+33
|\ \ \ \ \ | | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | ecac50e1 Autogen: Skip included files on demand Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1039
| * | | | Autogen: Skip included files on demandSebastian Holtermann2017-07-101-28/+33
| | | | |
* | | | | Merge topic 'doc_configure_file'Brad King2017-07-112-2/+4
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c7d81e16 Help: Explicitly state that some file generations are lazy Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1025
| * | | | | Help: Explicitly state that some file generations are lazySylvain Joubert2017-07-072-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | Fixes: #16856
* | | | | | Merge topic 'FindPkgConfig-rerun'Brad King2017-07-111-1/+3
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3cf267cf FindPkgConfig: do not always rerun pkg_check_modules() with 2 arguments Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1036
| * | | | | | FindPkgConfig: do not always rerun pkg_check_modules() with 2 argumentsRolf Eike Beer2017-07-101-1/+3
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit v3.8.0-rc1~47^2 (FindPkgConfig: Recheck pkg-config on parameter change, 2017-01-17) calling `pkg_check_modules` always re-runs. The problem is that if there are only 2 arguments passed to `pkg_check_modules```, then `_module0` will be set and `ARGN` will be empty. When this is written to cache it will be stored as just the value of `_module0` without any semicolon, so on the next run this doesn't match the expected value and the search is rerun. Revise the logic to handle the case of empty `ARGN` separately. Fixes: #17003
* | | | | | Merge topic 'FindHDF5-windows'Brad King2017-07-111-15/+27
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6848ff4c FindHDF5: Define H5_BUILT_AS_DYNAMIC_LIB when using Windows DLLs 6f131f49 FindHDF5: Add support for HDF5_USE_STATIC_LIBRARIES on Windows Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1023
| * | | | | | FindHDF5: Define H5_BUILT_AS_DYNAMIC_LIB when using Windows DLLsKris Thielemans2017-07-071-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When searching for shared libraries on Windows, add H5_BUILT_AS_DYNAMIC_LIB to HDF5_DEFINITIONS so that the header file knows how to dllimport the symbols.
| * | | | | | FindHDF5: Add support for HDF5_USE_STATIC_LIBRARIES on WindowsKris Thielemans2017-07-071-15/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Also add the `_D` suffix for debug libraries.
* | | | | | | CMake Nightly Date StampKitware Robot2017-07-111-1/+1
| | | | | | |
* | | | | | | Merge branch 'release-3.9'Brad King2017-07-100-0/+0
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| * | | | | | Merge branch 'autogen-no-generated-files' into release-3.9Brad King2017-07-073-0/+10
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'find_package-restore-considered-configs' into release-3.9Brad King2017-07-0712-2/+47
| |\ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | |
* | | | | | | | Merge topic 'autogen-no-generated-files'Brad King2017-07-103-0/+10
|\ \ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9a34e95a Autogen: Skip generated files for compatibility with CMake 3.8 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1033
| * | | | | | | Autogen: Skip generated files for compatibility with CMake 3.8Brad King2017-07-073-0/+10
| | |_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The change in commit v3.9.0-rc1~464^2~8 (Autogen: Add AUTOMOC/UIC support for generated source files, 2017-03-02) changes behavior of existing projects that may not expect `AUTOGEN` on generated files and do not yet set `SKIP_AUTOGEN` on them. Disable the behavior change for now to fix the regression for CMake 3.9. We can restore it later with a policy. In order to keep the implementation and tests working, add an undocumented property we can use in the tests to enable the behavior before the policy is introduced. Fixes: #17031 Issue: #16186
* | | | | | | Merge topic 'find_package-restore-considered-configs'Brad King2017-07-1012-2/+47
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e7730d78 find_package: Restore longer message when config files were considered Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1032
| * | | | | | find_package: Restore longer message when config files were consideredBrad King2017-07-0712-2/+47
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit v3.9.0-rc1~58^2 (find_package: shorten output for missing package in config mode, 2017-05-09) we print only the one line - Could NOT find Foo (missing: Foo_DIR) when package Foo cannot be found in CONFIG mode and it is not REQUIRED. However, in the case that package configuration files were found but not used, this one line message leaves out important information. This can happen when a package configuration file sets `Foo_FOUND` to `FALSE` or when its package version file does not match the requested version. Restore the longer message in these cases. Otherwise a seemingly valid explicit `Foo_DIR` setting appears to be silently ignored even if it was considered. Fixes: #17029
* | | | | | Merge topic 'indented_cmakedefine'Brad King2017-07-1011-7/+90
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 58f47448 configure_file: Add support for indented cmakedefine Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1024
| * | | | | | configure_file: Add support for indented cmakedefineSylvain Joubert2017-07-0411-7/+90
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Optional spaces and/or tabs are now understood between the '#' character and the 'cmakedefine'/'cmakedefine01' words. This indentation is preserved in the output lines. Fixes: #13037
* | | | | | | CMake Nightly Date StampKitware Robot2017-07-101-1/+1
| | | | | | |
* | | | | | | CMake Nightly Date StampKitware Robot2017-07-091-1/+1
| | | | | | |
* | | | | | | CMake Nightly Date StampKitware Robot2017-07-081-1/+1
| |_|_|_|/ / |/| | | | |
* | | | | | Merge branch 'release-3.9'Brad King2017-07-070-0/+0
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | Merge branch 'FindDoxygen-create-output-dir' into release-3.9Brad King2017-07-061-3/+11
| |\ \ \ \ \
* | \ \ \ \ \ Merge topic 'add-missing-fallthrough'Brad King2017-07-071-1/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6c80e958 cmCTest: Add missing switch case fallthrough markup Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1027
| * | | | | | | cmCTest: Add missing switch case fallthrough markupBrad King2017-07-051-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Without this, GCC 7 warns. Reported-by: Rolf Eike Beer <eike@sf-mail.de>
* | | | | | | | Merge topic 'iar_improved'Brad King2017-07-0721-96/+326
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d8e6cd9e IAR: Improve support for IAR ARM Compiler 0b1a2876 Add a CMAKE_<LANG>_COMPILER_ARCHITECTURE_ID variable fea7d69d Store CMAKE_ASM_COMPILER_VERSION persistently d2a8b5ce CMakeDetermineASMCompiler: Fix small copy-paste mistake a2112257 Add infrastructure to use language extensions without any standard 8cd28bb0 cmLocalGenerator: Switch order of <LANG>_{EXTENSIONS,STANDARD} check 0fc2d78e cmLocalGenerator: Simplify logic for language standard or extension flag Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !991
| * | | | | | | | IAR: Improve support for IAR ARM CompilerNorbert Lange2017-06-2912-75/+233
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make the implementation for this compiler more complete. IAR has multiple C++ modes, historically they were reduced c++ versions for embedded that gradually improved to the full standard (which can be reduced again by e.g. disabling rtti and exceptions). The new implementation picks the best available, but the c++ mode can also be overridden by defining `CMAKE_IAR_CXX_FLAG`. Add C/C++ standard flags so that all modes up to and including the last supported standard are defined. Fixes: #16826
| * | | | | | | | Add a CMAKE_<LANG>_COMPILER_ARCHITECTURE_ID variableNorbert Lange2017-06-2911-0/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Compilers such as MSVC and IAR may have variants that target different architectures. We have been using a `MSVC_<LANG>_ARCHITECTURE_ID` variable to hold this information for MSVC. Add an alternative with a more general name (later we can port MSVC to it too). This additional information may be needed to generate proper invocations of the compiler based on its architecture variant.
| * | | | | | | | Store CMAKE_ASM_COMPILER_VERSION persistentlyNorbert Lange2017-06-292-13/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We already do this for other languages like C and CXX.
| * | | | | | | | CMakeDetermineASMCompiler: Fix small copy-paste mistakeNorbert Lange2017-06-291-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | GNU is not a vendor of IAR.
| * | | | | | | | Add infrastructure to use language extensions without any standardBrad King2017-06-291-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When `<LANG>_STANDARD` is not set we will not add any language standard flags. If `<LANG>_EXTENSIONS` is not OFF then our default is supposed to be ON. In order to support compilers that do not enable their extensions by default, check a `CMAKE_<LANG>_EXTENSION_COMPILE_OPTION` variable for an extensions flag to use without any language standard. Suggested-by: Norbert Lange <nolange79@gmail.com>