summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'boost-1.67'Brad King2018-03-221-41/+129
|\ | | | | | | | | | | | | 1673923c30 FindBoost: Add support for Boost 1.67 with Python version suffixes Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1865
| * FindBoost: Add support for Boost 1.67 with Python version suffixesRoger Leigh2018-03-211-41/+129
| | | | | | | | Fixes: #16612, #16335, #16391, #12955
* | Merge topic 'ccmake-revise-default'Brad King2018-03-224-12/+95
|\ \ | | | | | | | | | | | | | | | | | | 99bf77f49c ccmake: Check for curses more robustly before enabling Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1881
| * | ccmake: Check for curses more robustly before enablingBrad King2018-03-214-12/+95
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Compute a default for `BUILD_CursesDialog` by building a small test project that uses curses. Disable `ccmake` by default if it fails, and do not search for Curses as part of the main build. This avoids creating FindCurses cache entries when we are not considering ccmake. If `BUILD_CursesDialog` is enabled (e.g. by the user) then warn if curses cannot be found.
* | | Merge topic 'vs-flags-improvement'Brad King2018-03-222-72/+65
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 5697c6ae03 cmVisualStudioGeneratorOptions: Factor out an OutputFlag helper Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1862
| * | | cmVisualStudioGeneratorOptions: Factor out an OutputFlag helperVitaly Stakhovsky2018-03-202-72/+65
| | | |
* | | | Merge topic 'clarify_inherited_properties'Brad King2018-03-2211-24/+205
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ff6234509e Help: Clarify behavior of INHERITED properties 9cc97ab4dc Tests: Add tests for INHERITED property chaining Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1879
| * | | | Help: Clarify behavior of INHERITED propertiesCraig Scott2018-03-217-24/+71
| | | | | | | | | | | | | | | Fixes: #17839
| * | | | Tests: Add tests for INHERITED property chainingCraig Scott2018-03-214-0/+134
| | | | |
* | | | | Merge topic 'find-package_root-revise'Brad King2018-03-222-6/+16
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3f479a3ca3 find_package: Improve CMP0074 warning messages Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1880
| * | | | | find_package: Improve CMP0074 warning messagesBrad King2018-03-212-6/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Policy `CMP0074` was added by commit eb35d8884b (find_package: Use PackageName_ROOT variables as search prefixes, 2018-03-15). Revise the logic to avoid warning when a `PackageName_ROOT` variable is set to empty since that won't change the search behavior. Also, when we do warn include the variable value(s) for reference.
* | | | | | CMake Nightly Date StampKitware Robot2018-03-221-1/+1
| |_|_|/ / |/| | | |
* | | | | Merge topic 'FindPython-new-implementation'Brad King2018-03-2128-13/+1614
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 50b5e9ed13 CMake build: Use new FindPython module 352baee207 FindPython*: New implementation for Python stuff Acked-by: Kitware Robot <kwrobot@kitware.com> Reviewed-by: Ben Boeckel <ben.boeckel@kitware.com> Acked-by: Alex Turbov <i.zaufi@gmail.com> Merge-request: !1819
| * | | | | CMake build: Use new FindPython moduleMarc Chevrier2018-03-204-11/+10
| | | | | |
| * | | | | FindPython*: New implementation for Python stuffMarc Chevrier2018-03-2024-2/+1604
| | | | | | | | | | | | | | | | | | | | | | | | Fixes: #16142
* | | | | | Merge topic 'wcdh-gcc-null'Brad King2018-03-211-1/+12
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | dc863592bc WCDH: use better fallback value for nullptr with old gcc versions Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1877
| * | | | | | WCDH: use better fallback value for nullptr with old gcc versionsRolf Eike Beer2018-03-201-1/+12
| | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | GCC supports the __null builtin basically forever (since at least 2.95), which behaves very much like nullptr later does. Use this instead of plain "0" as fallback value, otherwise passing the define to functions annotated with __attribute__((sentinel)) will result in a compiler warning.
* | | | | | Merge topic 'cuda_arch'Brad King2018-03-211-5/+20
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e743fc8e91 FindCUDA/select_compute_arch: Add support for CUDA as a language Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1856
| * | | | | | FindCUDA/select_compute_arch: Add support for CUDA as a languageHenry Fredrick Schreiner2018-03-201-5/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Even though this is an internal module, we can still prepare it to be used in another public-facing module outside of `FindCUDA`. Issue: #16586
* | | | | | | Merge topic 'pr.target_compile_definitions'Brad King2018-03-211-0/+10
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3af1daa186 Help: Document target_compile_definitions handling of -D Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1873
| * | | | | | | Help: Document target_compile_definitions handling of -DRuslan Baratov2018-03-201-0/+10
| | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | Add an example of using the `target_compile_definitions` command and a note about usage of ``-D`` in items.
* | | | | | | Merge topic 'makefile-fix-depend-optimization'Brad King2018-03-211-3/+8
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8c0f12c4aa Makefile: Restore use of dependency scanning cache Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1870
| * | | | | | | Makefile: Restore use of dependency scanning cachetsecer harry2018-03-201-3/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit v2.8.0~27 (Major optimization of C/C++ dependency scanning, 2009-09-23) our `VaildDeps` cache of `depend.internal` content is supposed to avoid re-scanning dependencies of object files whose dependencies have not changed. However, this was broken by changes to `cmDependsC::WriteDependencies` by commit v3.1.0-rc1~272^2~1 (cmDepends: Refactor object file path conversion, 2014-07-22). The object file path written to `depend.internal` was changed to a relative path, but the lookup in the `ValidDeps` cache of that information was not updated too. Therefore the cache is not used. Fix the object file path used for the `ValidDeps` lookup to restore the original optimization.
* | | | | | | | Merge topic 'ccmake-solaris'Brad King2018-03-211-0/+13
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3b7be02480 ccmake: Fix compilation with ncurses on Solaris Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1876
| * | | | | | | | ccmake: Fix compilation with ncurses on SolarisBrad King2018-03-201-0/+13
| | |_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On Solaris the ncurses header may define an `__attribute__` macro. This breaks C++ headers that use `__attribute__(...)` syntax. Somehow it causes references to unresolved symbols: __gthrw_pthread_once __gthrw_pthread_mutex_lock __gthrw_pthread_mutex_unlock instead of references to the correct symbols: pthread_once pthread_mutex_lock pthread_mutex_unlock Detect this case and undefine the `__attribute__` macro after including the curses headers.
* | | | | | | | Merge branch 'release-3.11'Brad King2018-03-210-0/+0
|\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'sunpro-5.15' into release-3.11Brad King2018-03-212-2/+6
| |\ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | Merge-request: !1875
* | | | | | | | | Merge topic 'sunpro-5.15'Brad King2018-03-212-2/+6
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4267960fc9 Features: Record for SunPro 5.15 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1875
| * | | | | | | | Features: Record for SunPro 5.15Brad King2018-03-202-2/+6
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | Oracle Developer Studio 12.6 adds support for more C++ 11 features.
* | | | | | | | CMake Nightly Date StampKitware Robot2018-03-211-1/+1
| |/ / / / / / |/| | | | | |
* | | | | | | Merge topic 'pr.install_name_dir'Brad King2018-03-201-0/+4
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 16eaf2d271 Help: Reference CMAKE_INSTALL_NAME_DIR from INSTALL_NAME_DIR Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Brad King <brad.king@kitware.com> Merge-request: !1872
| * | | | | | | Help: Reference CMAKE_INSTALL_NAME_DIR from INSTALL_NAME_DIRRuslan Baratov2018-03-201-0/+4
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge topic 'list-join'Brad King2018-03-2016-0/+93
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a58158727b list(): add `JOIN` sub-command Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1846
| * | | | | | | list(): add `JOIN` sub-commandMarc Chevrier2018-03-2016-0/+93
| | | | | | | |
* | | | | | | | Merge topic 'FindwxWidgets-msvc-v141'Brad King2018-03-201-6/+6
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 73738f620f FindwxWidgets: Add support for MSVC versions of the v141 toolset Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1861
| * | | | | | | | FindwxWidgets: Add support for MSVC versions of the v141 toolsetAdam Oleksy2018-03-191-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit v3.8.0-rc3~7^2 (FindwxWidgets: Add support for VS 2017 v141 toolset, 2017-03-22) more MSVC updates have been released that use a MSVC_VERSION value higher than 1910. Revise our checks accordingly. Issue: #16735
* | | | | | | | | Merge topic 'make_GetItems_const'Brad King2018-03-202-2/+2
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8e20ad1a5e cmComputeLinkInformation: make GetItems() const Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1863
| * | | | | | | | | cmComputeLinkInformation: make GetItems() constMichael Stürmer2018-03-192-2/+2
| | | | | | | | | |
* | | | | | | | | | Merge topic 'vs-indentfix'Brad King2018-03-201-0/+3
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b82ad18fe0 cmVisualStudio10TargetGenerator: fix indentation Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1868
| * | | | | | | | | cmVisualStudio10TargetGenerator: fix indentationVitaly Stakhovsky2018-03-191-0/+3
| | |_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | Added printing empty string to get the right indentation.
* | | | | | | | | CMake Nightly Date StampKitware Robot2018-03-201-1/+1
| |_|_|_|/ / / / |/| | | | | | |
* | | | | | | | Merge topic 'doc-set_target_properties-clarify'Brad King2018-03-191-2/+4
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 89ee7ce3ea Help: Reference set_property from set_target_properties c27e3e0f2b Help: Clarify that set_target_properties supports multiple targets Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1866
| * | | | | | | | Help: Reference set_property from set_target_propertiesBrad King2018-03-191-0/+2
| | | | | | | | |
| * | | | | | | | Help: Clarify that set_target_properties supports multiple targetsBrad King2018-03-191-2/+2
| | |_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | Reported-by: Alan W. Irwin <irwin@beluga.phys.uvic.ca>
* | | | | | | | Merge branch 'release-3.11'Brad King2018-03-190-0/+0
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | / / / | | |_|_|/ / / | |/| | | | |
| * | | | | | CMake 3.11.0-rc4v3.11.0-rc4Brad King2018-03-191-1/+1
| | | | | | |
* | | | | | | Merge branch 'release-3.11'Brad King2018-03-190-0/+0
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge branch 'revert-findqt4-dirs-fix' into release-3.11Brad King2018-03-191-12/+1
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !1867
* | \ \ \ \ \ \ Merge topic 'revert-findqt4-dirs-fix'Brad King2018-03-191-12/+1
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cf06962d73 FindQt4: Revert "Set PLUGINS and IMPORTS dir even if empty" Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1867
| * | | | | | | FindQt4: Revert "Set PLUGINS and IMPORTS dir even if empty"Brad King2018-03-191-12/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The change in commit v3.11.0-rc1~306^2 (FindQt4: Set PLUGINS and IMPORTS dir even if empty, 2017-11-19) regressed existing builds on some machines. Revert it for CMake 3.11 pending further investigation. Fixes: #17814, #17817 Issue: #14155, #17492