summaryrefslogtreecommitdiffstats
path: root/Source
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'server-target-backtraces'Brad King2017-07-134-20/+75
|\ | | | | | | | | | | | | | | 0c572382 server: Report backtraces in codemodel response 4db32275 server: Rename cmServerProtocol1_0 to cmServerProtocol1 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !992
| * server: Report backtraces in codemodel responseIvan Shcherbakov2017-07-112-1/+56
| | | | | | | | | | | | | | | | | | | | Report the source locations (e.g. in `CMakeLists.txt`) for all targets and target-related statements. This allows IDEs to locate the statements and automatically edit them when the user adds or removes files or changes target properties via GUI. Increment the protocol minor version number to tell clients that the new information is available.
| * server: Rename cmServerProtocol1_0 to cmServerProtocol1Ivan Shcherbakov2017-07-063-19/+19
| | | | | | | | | | | | It will serve additional minor versions. Suggested-by: Tobias Hunger <tobias.hunger@qt.io>
* | Merge topic 'source-group-regex-tweaks'Brad King2017-07-132-4/+8
|\ \ | | | | | | | | | | | | | | | | | | 2c82d9c8 Add more extensions to Resources source group by default Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1028
| * | Add more extensions to Resources source group by defaultUfoXp2017-07-102-4/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | Extend the Resources group regex to match pdf, png, jpeg, jpg, storyboards, and xcassets. This cleans up more complex Xcode projects a lot. While at it, factor the regular expressions for both "Resources" and "Source Files" into macros.
* | | CMake Nightly Date StampKitware Robot2017-07-131-1/+1
| | |
* | | Merge topic 'vs-2017-sln-guid'Brad King2017-07-121-4/+16
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 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-111-4/+16
| | | | | | | | | | | | | | | | | | | | | | | | 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-123-18/+3
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-111-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-121-10/+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-101-10/+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 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-111-0/+28
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-101-0/+28
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 branch 'autogen_p' into release-3.9Brad King2017-07-051-1/+0
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'autogen-header-skip' into release-3.9Brad King2017-07-051-1/+1
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'vs-link-guard-cf' into release-3.9Brad King2017-06-302-6/+0
| |\ \ \ \ \ \ \
* | | | | | | | | CMake Nightly Date StampKitware Robot2017-07-111-1/+1
| | | | | | | | |
* | | | | | | | | Merge topic 'autogen-no-generated-files'Brad King2017-07-101-0/+7
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-071-0/+7
| | |_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-101-1/+2
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-071-1/+2
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-101-7/+11
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-041-7/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 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-071-7/+17
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | | | | | 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>
| * | | | | | | | | | cmLocalGenerator: Switch order of <LANG>_{EXTENSIONS,STANDARD} checkBrad King2017-06-291-5/+5
| | | | | | | | | | |
| * | | | | | | | | | cmLocalGenerator: Simplify logic for language standard or extension flagBrad King2017-06-291-2/+2
| | | | | | | | | | |
* | | | | | | | | | | Merge topic 'connect_disablePCH_with_cl_option'Brad King2017-07-075-5/+10
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d1713d8b VS: connect /Y- compiler option with "Not Using Precompiled Headers" Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1026
| * | | | | | | | | | | VS: connect /Y- compiler option with "Not Using Precompiled Headers"Olender, Sebastian D2017-07-055-5/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The change allows to selectively disable PrecompiledHeaders. Despite the `$(VCTargetsPath)/1033/cl.xml` contains an empty value for switch, for effectively turn off setting need to use /Y- option as described on msdn: https://msdn.microsoft.com/en-us/library/1hy7a92h.aspx
* | | | | | | | | | | | CMake Nightly Date StampKitware Robot2017-07-071-1/+1
| |_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | |
* | | | | | | | | | | Merge topic 'autogen_p'Brad King2017-07-061-1/+0
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 251bcbed Autogen: Continue search for FOO_p.h when FOO.h was found Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1022
| * | | | | | | | | | Autogen: Continue search for FOO_p.h when FOO.h was foundSebastian Holtermann2017-07-021-1/+0
| | |_|_|_|_|/ / / / | |/| | | | | | | |
| * | | | | | | | | Merge branch 'xcode-cross-sdk-object-libraries' into release-3.9Brad King2017-06-302-5/+5
| |\ \ \ \ \ \ \ \ \
* | | | | | | | | | | CMake Nightly Date StampKitware Robot2017-07-061-1/+1
| |_|_|_|/ / / / / / |/| | | | | | | | |
* | | | | | | | | | Merge topic 'vs-link-guard-cf'Brad King2017-07-052-6/+0
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 82a5c2c6 VS: Fix support for '/guard:cf' linker flag Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1018
| * | | | | | | | | VS: Fix support for '/guard:cf' linker flagOlender, Sebastian D2017-06-302-6/+0
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Although `$(VCTargetsPath)/1033/link.xml` for v140 and v141 toolsets contains an entry for `LinkControlFlowGuard`, it does not work when used in a `.vcxproj` file. Drop our link flag table entries for these toolsets so that the flag will be passed via `AdditionalOptions`.
* | | | | | | | | Merge topic 'autogen-header-skip'Brad King2017-07-051-1/+1
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 83d8acee Autogen: Check .moc header name against SKIP list Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1017