Commit Graph

38782 Commits

Author SHA1 Message Date
Brad King
c6e8442e4c Merge branch 'update-buildsystem-docs' into release-3.11
Merge-request: !1839
2018-03-12 10:25:53 -04:00
Kai Wolf
78756429ab Help: Adapt cmake-buildsystem(7) to new IMPORTED targets features
Since commit v3.11.0-rc1~433^2~2 (Teach target_* commands to set
INTERFACE properties of IMPORTED targets, 2017-09-18) it is now possible
to use the customary `target_*` commands for adjusting the settings of
an IMPORTED target.  Update documentation accordingly.
2018-03-12 10:23:21 -04:00
Brad King
c5541cf0da CMake 3.11.0-rc3 2018-03-09 08:33:11 -05:00
Brad King
57f35bba84 Merge branch 'cuda-no-device-link-rsp' into release-3.11
Merge-request: !1831
2018-03-07 10:52:54 -05:00
Brad King
f64732f59b CUDA: Do not pass unsupported @rspfile arguments to NVCC
The nvcc compiler does not support `@<rspfile>` arguments.  It does
offer a `--options-file` argument that can be investigated later.

Fixes: #17797
2018-03-07 10:30:35 -05:00
Brad King
9288abf567 Merge branch 'update-kwsys' into release-3.11
Merge-request: !1830
2018-03-07 07:39:16 -05:00
Brad King
2c5b4359f8 Merge branch 'upstream-KWSys' into update-kwsys
* upstream-KWSys:
  KWSys 2018-03-07 (2ad561e7)
2018-03-07 06:48:34 -05:00
KWSys Upstream
64d4308d83 KWSys 2018-03-07 (2ad561e7)
Code extracted from:

    https://gitlab.kitware.com/utils/kwsys.git

at commit 2ad561e78b0d99f083f1213e403d5a8a90e0e134 (master).

Upstream Shortlog
-----------------

Brad King (4):
      6e190d9a Fix include directory usage requirement for build tree
      6d4e9fde SystemInformation: Android has no getifaddrs prior to API 24
      0a0974d0 SystemTools: Restore unconditional caching in GetActualCaseForPath
      a241fd13 SystemTools: Remove caching from public GetActualCaseForPath
2018-03-07 06:48:32 -05:00
Brad King
8070abf784 Merge branch 'autogen-empty-source-file-fix' into release-3.11
Merge-request: !1825
2018-03-06 08:45:29 -05:00
Sebastian Holtermann
50b7be6d1f Autogen: Check if a file is empty before reading it
Calling `std::string::front()` on an empty string results
in an undefined behavior by the C++ standard.
In gcc8 it causes an assertion to fail.

This adds a check to `AUTOGEN` if a file to read is empty
and in case avoids the use of an empty `std::string` buffer.

Closes #17793
2018-03-06 08:35:08 -05:00
Brad King
566f8fa2f3 Merge branch 'xl-new-compiler-macros' into release-3.11
Merge-request: !1820
2018-03-06 08:23:08 -05:00
Brad King
eb1a9be4b6 XL: Recognize compilers identified by __ibmxl__
IBM XL C/C++ for Linux versions 13.1.6 and above no longer define
`__IBMC__` or `__IBMCPP__` by default (see `-qxlcompatmacros`).
Instead `__ibmxl__` now identifies the compiler along with some
related new version macros.

Fixes: #17784
2018-03-06 07:43:04 -05:00
Brad King
ac925ec09e CMake 3.11.0-rc2 2018-02-27 09:34:35 -05:00
Brad King
e708dac65f Merge branch 'modules-restore-path-suffixes' into release-3.11
Merge-request: !1802
2018-02-26 10:53:16 -05:00
Brad King
7b1c14241d Modules: Restore recently removed search path suffixes
Refactoring in commit v3.11.0-rc1~293^2~4 (Modules: Remove paths set as
global Unix prefixes, 2017-11-20) removed `PATH_SUFFIXES` options that
appeared to be used to cover subdirectories of the `PATHS` options that
were also removed.  However, the path suffixes also apply to other
search paths and so should not be removed.  Restore them.

Fixes: #17760
2018-02-26 10:52:11 -05:00
Brad King
be9731965e Merge branch 'unixtimefix' into release-3.11
Merge-request: !1800
2018-02-26 10:36:26 -05:00
Bernhard M. Wiedemann
e1cd936c62 Tests: Fix TIMESTAMP-UnixTime test under SOURCE_DATE_EPOCH=1
The test was expecting timestamps on day 1 in 1970 to start at 86400 but
they actually started at 0.  This worked without `SOURCE_DATE_EPOCH=1`
because after 1972, leap days compensated the offset.

Fixes: #17762
2018-02-26 10:35:30 -05:00
Brad King
72a85d9f0b Merge branch '14297-partial-xcode-zero-check' into release-3.11
Merge-request: !1790
2018-02-23 08:17:51 -05:00
Gregor Jasny
481420ee89 Xcode: Generate ZERO_CHECK generator target only once
In case CMAKE_XCODE_GENERATE_TOP_LEVEL_PROJECT_ONLY has been enabled
generate only the root-level ZERO_CHECK target so targets in
subdirectories pick up the root generator target of ZERO_CHECK.

For the case that CMAKE_XCODE_GENERATE_TOP_LEVEL_PROJECT_ONLY is not
enabled more investigation and a proper and final fix is still needed.

Issue: 14297
2018-02-22 21:15:48 +01:00
Brad King
36fc89b7d9 Merge branch 'std-thread-link' into release-3.11
Merge-request: !1789
2018-02-22 13:15:58 -05:00
Brad King
94eee5e683 CMakeLib: Link to system thread libraries to support std::thread
Some environments require linking to thread libraries for `std::thread`.
Express this direct dependency of CMakeLib explicitly.  Previously this
was done indirectly through our bundled libuv, but that does not work
when using a system libuv.

Fixes: #17757
2018-02-22 12:59:20 -05:00
Brad King
13c5a91197 Merge branch 'test-CompileFeatures-c11-range' into release-3.11
Merge-request: !1785
2018-02-21 14:41:56 -05:00
Brad King
972f7caad3 Tests: Make CompileFeatures C dialect check consistent with impl
`Modules/CMakeCCompilerId.c.in` will report the C dialect as 11 whenever
`__STDC_VERSION__` indicates *at least* C 11.  Make the test consistent
with this.  We already do this for the C++ case.

Fixes: #17740
2018-02-21 14:39:09 -05:00
Brad King
d513a4035b Merge branch 'autogen-depend-filters-documentation' into release-3.11
Merge-request: !1782
2018-02-21 10:33:12 -05:00
Sebastian Holtermann
bfffe42b98 Autogen: Doc: Extend AUTOMOC_DEPEND_FILTERS documentation 2018-02-21 10:28:43 -05:00
Sebastian Holtermann
1cf7c54a6b Autogen: Doc: Extend AUTOGEN_TARGET_DEPENDS documentation 2018-02-21 10:28:43 -05:00
Brad King
82c23d6afc Merge branch 'ti-depfile-flag-fix' into release-3.11
Merge-request: !1774
2018-02-20 11:52:30 -05:00
Grzegorz Dobinski
cab9af7e97 Compiler/TI: Fix depfile generation for C++
In commit v3.11.0-rc1~466^2 (Compiler/TI: Add support for depfile
generation for Ninja, 2017-10-16) the flag for C++ was added in a
variable with a typo in its name.  Fix the spelling.

Issue: #17360
2018-02-20 11:52:11 -05:00
Brad King
eded0bae2e Merge branch 'help_fixup' into release-3.11
Merge-request: !1770
2018-02-16 09:42:09 -05:00
Shane Parris
1667e24453 Help: Fix command references in CMAKE_NETRC* variable documentation 2018-02-16 09:41:03 -05:00
Brad King
02edf08be2 Merge branch 'export-android-mk' into release-3.11
Merge-request: !1766
2018-02-15 08:42:07 -05:00
Brad King
b6d68766b1 Android.mk: Fix export of static libraries with PRIVATE dependencies
The `LINK_ONLY` generator expression is used to represent private
dependencies of static libraries in their `INTERFACE_LINK_LIBRARIES`
property value.  Fix evaluation of generator expressions during export
to support the `LINK_ONLY` genex.  Extend the RunCMake.AndroidMK test
with a case for this.
2018-02-14 11:24:05 -05:00
Brad King
56e1688517 Android.mk: Evaluate generator expressions up front
When exporting `INTERFACE_LINK_LIBRARIES`, we must evaluate generator
expressions first, before expanding the `;` list, in case they contain
or generate semicolons.
2018-02-14 11:19:47 -05:00
Brad King
43cd9467cd Merge branch 'autogen-write-on-change-only' into release-3.11
Merge-request: !1753
2018-02-13 11:05:11 -05:00
Brad King
101ef67b99 Merge branch 'FindImageMagick-FixFor7.0.x' into release-3.11
Merge-request: !1754
2018-02-13 11:03:55 -05:00
Brad King
2a730e24c6 Merge branch '17711-reset-xcode-target-var' into release-3.11
Merge-request: !1757
2018-02-13 11:03:15 -05:00
Gregor Jasny
4349393d1d cmGlobalXCodeGenerator: Properly initialize TARGETS variable
Fixes: #17711
2018-02-13 11:02:24 -05:00
Roman Wüger
9178523968 FindImageMagick: Add 7.0 library names
For ImageMagick 7.0.x we need to consider `CORE_RL_MagickWand_` and
`CORE_RL_MagickCore_`.
2018-02-06 14:54:33 -05:00
Sebastian Holtermann
c85ef9c339 Autogen: Overwrite info files when changed only
Check if the content of the AUTOMOC/UIC/RCC info file
will change before overwriting it. This avoids unnecessary
AUTORCC rebuilds when AUTORCC unrelated CMake settings change.
2018-02-06 11:20:08 -05:00
Brad King
51b287c40c CMake 3.11.0-rc1 version update 2018-02-05 11:16:50 -05:00
Brad King
e29df9924a Help: Drop development topic notes to prepare release
Release versions do not have the development topic section of
the CMake Release Notes index page.
2018-02-05 11:15:14 -05:00
Brad King
9c1efb614d Merge topic 'doc-3.11-relnotes'
acbbccf7 Help: Organize and revise 3.11 release notes
22ac06ed Help: Consolidate 3.11 release notes

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1751
2018-02-05 11:14:31 -05:00
Brad King
acbbccf704 Help: Organize and revise 3.11 release notes
Add section headers similar to the 3.10 release notes and move each
individual bullet into an appropriate section.  Revise a few bullets.
2018-02-05 10:56:36 -05:00
Brad King
22ac06edb8 Help: Consolidate 3.11 release notes
Run the `Utilities/Release/consolidate-relnotes.bash` script to move
notes from `Help/release/dev/*` into `Help/release/3.11.rst`.
2018-02-05 09:32:26 -05:00
Brad King
a40768b5af Merge topic 'bootstrap-try-clang'
04167e39 bootstrap: Add Clang to known compiler candidates

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1749
2018-02-05 09:28:01 -05:00
Axel Huebl
04167e39c3 bootstrap: Add Clang to known compiler candidates
Add `clang` and `clang++` after the corresponding `gcc` and `g++`
candidates.  Otherwise it is not tried on platforms where we do not
enumerate the toolchain pair candidates.
2018-02-05 08:58:41 -05:00
Brad King
fba5980fa6 Merge topic 'fix_help_cmake_parse_arguments'
b95eda9b Help: Fix code example in cmake_parse_arguments.rst

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1747
2018-02-05 08:47:36 -05:00
Brad King
213ecf05d6 Merge topic 'autogen-improve-multi-config'
a8ee7406 Autogen: Improved multi-config include scheme

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1735
2018-02-05 08:43:05 -05:00
Brad King
e559b45ff8 Merge topic 'autogen-documentation'
c4ffbb79 Autogen: Documentation: Update for AUTORCC changes

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1744
2018-02-05 08:42:33 -05:00
Brad King
4d9ccd0abd Merge topic 'vs-static-ConvertToWindowsSlash'
6d148d6d cmVisualStudio10TargetGenerator: Limit scope of ConvertToWindowsSlash()

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1741
2018-02-05 08:41:52 -05:00