summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'document_env_variables'Craig Scott2017-09-2729-0/+261
|\ | | | | | | | | | | | | e6b77c5f Help: Document CMake's environment variables Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1235
| * Help: Document CMake's environment variablesRobert Maynard2017-09-2629-0/+261
| |
* | Merge topic 'CMakeCPack-source-ignore'Brad King2017-09-272-6/+18
|\ \ | | | | | | | | | | | | | | | | | | fa23f66a CMakeCPack: Exclude version-control-specific files from source package Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1314
| * | CMakeCPack: Exclude version-control-specific files from source packageBrad King2017-09-262-6/+18
| | |
* | | Merge topic 'auto_ptr'Brad King2017-09-2754-573/+353
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | f0489856 Retire std::auto_ptr and its macro CM_AUTO_PTR Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Pavel Solodovnikov <hellyeahdominate@gmail.com> Merge-request: !1300
| * | | Retire std::auto_ptr and its macro CM_AUTO_PTRMatthias Maennich2017-09-2554-573/+353
| | | | | | | | | | | | | | | | Signed-off-by: Matthias Maennich <matthias@maennich.net>
* | | | Merge topic 'vs-guid-tolerate-no-curly'Brad King2017-09-272-2/+10
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b3e6514c VS: Adapt project parsers to support "ProjectGUID" without curly brackets Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1313
| * | | | VS: Adapt project parsers to support "ProjectGUID" without curly bracketsFredrik Orderud2017-09-262-2/+10
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | This is needed to correctly parse Windows Installer "wiproj" projects, that by default contain "ProjectGUID" tags with GUID values without surrounding curly brackets. Otherwise CMake truncates the first & last character from the GUID value for these projects.
* | | | Merge topic 'reduce-strcpy'Brad King2017-09-271-33/+16
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e43cb4c1 CursesDialog: avoid calling strcpy() Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1311
| * | | | CursesDialog: avoid calling strcpy()Rolf Eike Beer2017-09-251-33/+16
| | |/ / | |/| | | | | | | | | | | | | | Also use memset() and a few places where the compiler will collapse the for loop into such a call anyway.
* | | | Merge topic 'GetPrerequisites-no-clear-on-missing'Brad King2017-09-275-1/+11
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1a7b8c83 GetPrerequisites: Restore behavior on missing binary of not clearing list Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1312
| * | | | GetPrerequisites: Restore behavior on missing binary of not clearing listBrad King2017-09-265-1/+11
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prior to commit v3.4.0-rc1~264^2~1 (GetPrerequisites: Add error checks for execute_process() calls, 2015-07-29), `get_prerequisites` would simply warn on a missing binary and not update the result list at all. That commit accidentally made the case an error. This was fixed by commit v3.8.0-rc1~110^2 (GetPrerequisites: Do not fail on files we cannot find, 2017-01-10), but the fix also cleared the result list. Clearing the list is incorrect because it is supposed to be able to accumulate results over multiple calls. Remove the list clearing behavior to restore the original behavior on a missing binary. Fixes: #17306
* | | | Merge topic 'autogen-per-config-sources'Brad King2017-09-2710-252/+380
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4603d6b0 Autogen: Docs: Add documentation internal links f86ba8ee Autogen: Reintroduce per-config sources support 5d3bca64 Autogen: Rename cmQtAutoGen::GeneratorType to cmQtAutogen::Generator Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1307
| * | | | Autogen: Docs: Add documentation internal linksSebastian Holtermann2017-09-253-8/+8
| | | | |
| * | | | Autogen: Reintroduce per-config sources supportSebastian Holtermann2017-09-257-218/+346
| | | | | | | | | | | | | | | | | | | | Reintroduce per-config sources support in AUTOGEN but disable it by default.
| * | | | Autogen: Rename cmQtAutoGen::GeneratorType to cmQtAutogen::GeneratorSebastian Holtermann2017-09-255-29/+29
| | | | |
* | | | | Merge topic 'ninja-rc-depfile-quoting'Brad King2017-09-272-1/+8
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | df965cb9 Ninja: Fix quoting of RC language depfile in cmcldeps call Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1309
| * | | | | Ninja: Fix quoting of RC language depfile in cmcldeps callBrad King2017-09-252-1/+8
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit v3.0.0-rc1~448^2 (Ninja: use deps = gcc/msvc feature, 2013-10-18) the value of the `DEP_FILE` binding already includes the needed quoting to refer to the file. However, that commit forgot to update one of the `$DEP_FILE` references to not be quoted anymore. The offending code path currently only affects cmcldeps for RC. Remove the extra quoting now. Fixes: #17298
* | | | | Merge topic 'FindOpenGL-glvnd'Brad King2017-09-275-40/+349
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e2e8a690 FindOpenGL: Add support for GLVND on Linux Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !782
| * | | | | FindOpenGL: Add support for GLVND on LinuxTom Fogal2017-09-255-40/+349
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Find GLVND components if available. Add `GLX` and `EGL` options for COMPONENTS that allow requesting these libraries explicitly. Introduce new import targets for these windowing-system-specific libraries. On a GLVND system, populate the legacy `OPENGL_LIBRARIES` variable and the `OpenGL::GL` target using the `OpenGL` and `GLX` components. On non-GLVND systems, continue to use the legacy `GL` library and simply do not provide the GLVND components. Application code can choose to adapt based on the availability of GLVND components as imported targets.
* | | | | Merge topic 'revert-perf-source-lookup'Brad King2017-09-274-59/+20
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a7005c98 Tests: Add case for legacy source file property behavior 1604716d Revert "Performance: Improve efficiency of source file lookup in cmMakefile" Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1308
| * | | | | Tests: Add case for legacy source file property behaviorBrad King2017-09-252-1/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The change in commit 3b95ab5693 (Performance: Improve efficiency of source file lookup in cmMakefile, 2017-08-17) broke some legacy behavior of source file properties in which the order sources are first resolved with extensions affects how setting properties without extensions works. It has been reverted for now, but the discovery was made after merging because the broken case was not covered by our test suite. Add a test case representing the legacy behavior. Issue: #15208
| * | | | | Revert "Performance: Improve efficiency of source file lookup in cmMakefile"Brad King2017-09-252-58/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 3b95ab569345028a1a8fe521d5ecd81fa97f2653. It regressed some legacy source file property behavior. Revert pending further investigation.
* | | | | | Merge branch 'release-3.9'Brad King2017-09-270-0/+0
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use the "ours" merge strategy because we're merging a fixup that is specific to the 3.9 branch and do not need the changes in `master`.
| * \ \ \ \ \ Merge branch 'FindBoost-fix-policy-scope' into release-3.9Brad King2017-09-271-2/+0
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This has no corresponding merge-request because the branch was made as a direct fixup specific to 3.9.
| | * | | | | | FindBoost: Finish reverting "Simplify search in lists" for 3.9Brad King2017-09-271-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In commit v3.9.2~3^2 (FindBoost: Revert "Simplify search in lists.", 2017-09-05) we forgot to also revert commit commit v3.9.1~15^2 (FindBoost: pop policy stack before returning, 2017-07-24) which had been made as a fixup to the original commit. Fixes: #17309
* | | | | | | | CMake Nightly Date StampKitware Robot2017-09-271-1/+1
| |_|_|_|_|/ / |/| | | | | |
* | | | | | | Merge topic 'doc-MSVC_VERSION'Brad King2017-09-261-10/+12
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0741b6e2 Help: Update MSVC_VERSION documentation 00d9dd95 Help: Document MSVC_VERSION value 1911 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1310
| * | | | | | | Help: Update MSVC_VERSION documentationBrad King2017-09-251-11/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add the corresponding toolset name for each version. While at it, link to the general compiler version variable.
| * | | | | | | Help: Document MSVC_VERSION value 1911Wojciech Mamrak2017-09-251-0/+1
| | |_|_|/ / / | |/| | | | |
* | | | | | | CMake Nightly Date StampKitware Robot2017-09-261-1/+1
|/ / / / / /
* | | | | | Merge topic 'load_command-cleanup'Brad King2017-09-251-25/+10
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0332ec72 cmCPluginAPI: remove explicit casts to void* cf399036 cmCPluginAPI: do not check pointer before calling free() 6e2b1853 cmCPluginAPI: use strdup() instead of open coding it Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1305
| * | | | | | cmCPluginAPI: remove explicit casts to void*Rolf Eike Beer2017-09-231-5/+4
| | | | | | |
| * | | | | | cmCPluginAPI: do not check pointer before calling free()Rolf Eike Beer2017-09-231-3/+1
| | | | | | |
| * | | | | | cmCPluginAPI: use strdup() instead of open coding itRolf Eike Beer2017-09-231-17/+5
| | | | | | |
* | | | | | | Merge topic 'FindOpenACC'Brad King2017-09-254-0/+259
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d3b6f291 FindOpenACC: Add module to detect compiler support for OpenACC Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1209
| * | | | | | | FindOpenACC: Add module to detect compiler support for OpenACCTin Huynh2017-09-224-0/+259
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge topic 'rc-missing-better-error'Brad King2017-09-252-32/+66
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0a8e23ad Windows: Improve link-time error messages when rc or mt fail c2d6835c cmSystemTools: Teach RunSingleCommand another way to report exceptions Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1260
| * | | | | | | Windows: Improve link-time error messages when rc or mt failJonathan Marler2017-09-221-32/+62
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We run extra tools during linking on Windows to deal with manifests. Report more information when these tools fail. For example, if the Windows SDK is not installed with VS then `rc.exe` will be missing.
| * | | | | | | cmSystemTools: Teach RunSingleCommand another way to report exceptionsJonathan Marler2017-09-201-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the caller captures stdout but not stderr then report exceptions through stdout instead of dropping them.
* | | | | | | | Merge topic 'cpackifw-options'Brad King2017-09-254-6/+77
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9a24ab6b CPackIFW: Add some options Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1298
| * | | | | | | | CPackIFW: Add some optionsKonstantin Podsvirov2017-09-214-6/+77
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The `CPackIFW` module `cpack_ifw_configure_component` and `cpack_ifw_configure_component_group` commands gained a new `REPLACES` and `CHECKABLE` options.
* | | | | | | | | Merge topic 'cxx17-no-bind1st'Brad King2017-09-252-4/+2
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 44d3a76d Avoid using std::bind1st that is removed in C++17 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1304
| * | | | | | | | | Avoid using std::bind1st that is removed in C++17Brad King2017-09-232-4/+2
| | |_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | Use a lambda instead now that we require C++11.
* | | | | | | | | Merge topic 'FindOpenMP-CMP0054'Brad King2017-09-251-0/+1
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | dd5324ab FindOpenMP: Avoid CMP0054 warnings Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1303
| * | | | | | | | | FindOpenMP: Avoid CMP0054 warningsBrad King2017-09-221-0/+1
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When invoked in projects that don't set CMP0054 to NEW, FindOpenMP triggers a warning: CMake Warning (dev) at .../Modules/FindOpenMP.cmake:... (if): Policy CMP0054 is not set...Quoted variables like "c" will no longer be dereferenced when the policy is set to NEW. Since the policy is not set the OLD behavior will be used. Set the policy within the module's scope to avoid this. Fixes: #17292
* | | | | | | | | Merge topic 'test-fix-msvc-standard-default'Brad King2017-09-251-13/+31
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a5dd1599 Tests: Fix RunCMake.try_compile CxxStandard case on MSVC Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1302
| * | | | | | | | Tests: Fix RunCMake.try_compile CxxStandard case on MSVCBrad King2017-09-221-13/+31
| | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In post-3.9 development we've taught CMake to understand C++ language standards for MSVC. The RunCMake.try_compile test needs to know whether to expect support or not. Previously we depended on the host CMake version to know this, but CMake 3.9 and below do not. Add special logic to the test to account for this.
* | | | | | | | CMake Nightly Date StampKitware Robot2017-09-251-1/+1
| | | | | | | |
* | | | | | | | Merge topic '`16839-better-tvos-support`'Craig Scott2017-09-242-1/+9
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 45e30d12 Xcode: Add team to compiler-id project 0be0e02c Xcode: Add tvOS and watchOS toolchain file support Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1278