mirrors/cmake
2
0 Fork 0
mirror of https://gitlab.kitware.com/cmake/cmake.git synced 2026-10-11 23:43:58 +03:00
Code Activity
47,352 Commits 2 Branches 415 Tags
94de927cab19609aeeff032c64f16cfd257fca2f
Commit Graph
47352 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Robert Maynard 9561d42f95 target_link_options: Add test to verify static library behavior 
Issue: #18251
 2018-08-09 12:52:44 -04:00
Brad King 574666b6cb librhash: Avoid incorrect int8_t definition with PGI on Linux ppc64le 
`sys/types.h` defines `int8_t` incorrectly as `char` which is unsigned.
Adjust ordering so `inttypes.h` defines it as `signed char` first.
 2018-08-09 11:51:22 -04:00
Brad King ad4452d1bd Merge topic 'doc-vs-generator-clarify-project-types' 
a82eb539f0 Help: Describe the type of Visual Studio projects that can be generated

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2262
 2018-08-09 11:24:24 -04:00
Justin Goshi 7e359823c9 MSVC: Preserve linker output encoding 
When using the Ninja or Makefile generator with MSVC on Windows
we invoke the linker through a `cmake -E vs_link_{exe,dll}` wrapper.
Preserve the linker output encoding to match `link.exe` behavior
instead of forcing UTF-8.
 2018-08-09 11:06:12 -04:00
Justin Goshi b7e7718a38 MSVC: Fix manifest resource encoding 
When using the Ninja or Makefile generator with MSVC on Windows
we invoke the resource compiler (`rc.exe`) to compile a manifest
resource.  CMake generates the file with UTF-8 encoding so we
need to add a pragma to inform the resource compiler.
 2018-08-09 11:03:10 -04:00
Jean-Christophe Fillion-Robin a82eb539f0 Help: Describe the type of Visual Studio projects that can be generated 
Issue: #17956
See-also: https://stackoverflow.com/questions/51647437/use-cmake-to-generate-visual-studio-python-projects/51666488
 2018-08-09 10:58:29 -04:00
Brad King c4b0e96c37 Merge branch 'release-3.12' 2018-08-09 10:02:31 -04:00
Sebastian Holtermann 52676e3794 Autogen: Tests: Use non inverting Qt version tests 2018-08-09 15:44:11 +02:00
Brad King c4ab098097 CMake 3.12.1 v3.12.1 2018-08-09 08:06:18 -04:00
Brad King 24f226e2d3 Merge topic 'document_cache_variable_checking' 
4d384d290e Help: Document the $CACHE{} syntax

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2269
 2018-08-09 08:00:49 -04:00
Brad King 75844dd609 Merge topic 'cleanup-find-cstr' 
69ca85cc7f Remove unnecessary c_str() in RegularExpression::find calls

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2271
 2018-08-09 08:00:03 -04:00
Brad King 34334c098f Merge topic 'cmGeneratedFileStream_string' 
b6802cd506 cmGeneratedFileStream: clang-tidy applied to remove redundant ``c_str`` calls
a688defcc6 cmGeneratedFileStream: Use ``std::string const&`` instead of ``const char*``

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2266
 2018-08-09 07:59:23 -04:00
Brad King a9badfa6f4 Merge topic 'intel-windows-xilib' 
ef6a08f6f7 Intel: Use xilib as librarian on Windows

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Christian Pfeiffer <cpfeiffer@live.de>
Merge-request: !2265
 2018-08-09 07:56:26 -04:00
Brad King ea3456c844 Merge topic 'update-liblzma' 
1e9c1d0c87 CTestCustom: Suppress scanbuild warning in liblzma
2461dd79e5 liblzma: Suppress MSVC warning parameter difference warning
9f77124ea8 liblzma: Drop checks for inline and restrict keywords
7a976ee742 Merge branch 'upstream-liblzma' into update-liblzma
352b8fa70d liblzma 2018-04-29 (b5be61cc)
021b54cab8 liblzma: Revise update script to get version 5.2.4
6b494f567a Merge branch 'upstream-liblzma' into update-liblzma
897b790d57 liblzma 2014-12-21 (265e5ffb)
...

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2264
 2018-08-09 07:55:38 -04:00
Brad King 575f06e48c Merge topic 'update-kwsys' 
ba872ea9c3 Merge branch 'upstream-KWSys' into update-kwsys
4d76239a51 KWSys 2018-08-07 (9044518f)

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2268
 2018-08-09 07:53:49 -04:00
Brad King 1c773b5d3a Merge topic 'iwyu-std-hash' 
aefb8559dc IWYU: Fix workaround mapping for std::hash

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2267
 2018-08-09 07:52:39 -04:00
Kitware Robot e1e9e0697b CMake Nightly Date Stamp 2018-08-09 00:01:05 -04:00
Kitware Robot 708dcbfdf5 CMake Nightly Date Stamp 2018-08-08 00:01:06 -04:00
Vitaly Stakhovsky 69ca85cc7f Remove unnecessary c_str() in RegularExpression::find calls 2018-08-07 15:28:24 -04:00
Robert Maynard 4d384d290e Help: Document the $CACHE{} syntax 
Also add a test case for the behavior.
 2018-08-07 13:13:27 -04:00
Brad King aefb8559dc IWYU: Fix workaround mapping for std::hash 
It is provided by `functional`, not `utility`.  Fix the mapping added by
commit 276d3c7afe (IWYU: Add workaround mapping for std::hash,
2018-07-31).  Also generalize the workaround from commit v3.12.0-rc1~39^2~1
(IWYU: Define a macro to tell code it is preprocessing for iwyu,
2018-05-25) to allow local builds to configure specific flags.  This
is needed because iwyu behaves differently in different environments.
 2018-08-07 12:04:58 -04:00
Sebastian Holtermann b6802cd506 cmGeneratedFileStream: clang-tidy applied to remove redundant `c_str` calls 
After changing the ``cmGeneratedFileStream`` methods to accept
``std::string const&`` instead of ``const char*`` we don't
need to call ``std::string::c_str`` anymore when passing
a ``std::string`` to a ``cmGeneratedFileStream`` method.

This patch removes all redundant ``std::string::c_str``
calls when passing a string to a ``cmGeneratedFileStream`` method.

It was generated by building CMake with clang-tidy enabled using
the following options:

-DCMAKE_CXX_CLANG_TIDY=/usr/bin/clang-tidy-4.0;-checks=-*,readability-redundant-string-cstr;-fix;-fix-errors
 2018-08-07 17:02:39 +02:00
Sebastian Holtermann a688defcc6 cmGeneratedFileStream: Use `std::string const& instead of const char*` 2018-08-07 16:57:40 +02:00
Sebastian Holtermann e7fb85d00d Autogen: Check if we can run the MocOsMacros test 
The MocOsMacros test requires moc to support moc_predefs.h
on some platforms (e.g. Mac). moc supports moc_predefs.h
inclusion since Qt 5.8, therefore run the MocOsMacros only if
Qt >= 5.8 and if CMAKE_CXX_COMPILER_PREDEFINES_COMMAND is
defined.

Fixes #18245
 2018-08-07 16:33:27 +02:00
Craig Scott d7a52f8c24 Merge topic 'productbuild-merge-output' 
496d22b8cc productbuild: Capture stderr too in CPackProductBuild logs

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2257
 2018-08-07 09:17:26 -04:00
yrHeTaTeJlb ef6a08f6f7 Intel: Use xilib as librarian on Windows 
We already use `xilink` instead of `link`, so use `xilib` instead of lib
too.

Suggested-by: Christian Pfeiffer <cpfeiffer@live.de>
Issue: #18240
 2018-08-07 08:32:31 -04:00
Brad King 8f0b3d2da6 Merge topic 'xerces-version-fix' 
00a5836a3d FindXercesC: Correct order of version detection and versioned library checks

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2259
 2018-08-07 08:25:21 -04:00
Brad King 1e9c1d0c87 CTestCustom: Suppress scanbuild warning in liblzma 2018-08-07 08:07:50 -04:00
Brad King ba872ea9c3 Merge branch 'upstream-KWSys' into update-kwsys 
* upstream-KWSys:
  KWSys 2018-08-07 (9044518f)
 2018-08-07 07:16:09 -04:00
KWSys Upstream 4d76239a51 KWSys 2018-08-07 (9044518f) 
Code extracted from:

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

at commit 9044518f428b84da70f1e02d09b7cd4c35366831 (master).

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

Jon Chronopoulos (1):
      55a29eba SystemTools: Allow FileExists on Windows to follow symlinks
 2018-08-07 07:16:04 -04:00
Kitware Robot 90df5f6730 CMake Nightly Date Stamp 2018-08-07 00:01:05 -04:00
Brad King 2461dd79e5 liblzma: Suppress MSVC warning parameter difference warning 
Some `.c` sources add `restrict` to their pointer types to tell
the optimizer that there is no aliasing.  These do not appear in
the corresponding `.h` declarations so MSVC warns.
 2018-08-06 10:29:33 -04:00
Brad King 9f77124ea8 liblzma: Drop checks for inline and restrict keywords 
We now require the compiler to support these, except for MSVC where
upstream liblzma already has special cases (in `common/sysdefs.h`).
 2018-08-06 10:25:46 -04:00
Brad King 7a976ee742 Merge branch 'upstream-liblzma' into update-liblzma 
* upstream-liblzma:
  liblzma 2018-04-29 (b5be61cc)
 2018-08-06 10:24:55 -04:00
liblzma upstream 352b8fa70d liblzma 2018-04-29 (b5be61cc) 
Code extracted from:

    https://git.tukaani.org/xz.git

at commit b5be61cc06088bb07f488f9baf7d447ff47b37c1 (v5.2.4).
 2018-08-06 10:24:54 -04:00
Brad King 021b54cab8 liblzma: Revise update script to get version 5.2.4 2018-08-06 10:24:21 -04:00
Brad King 6b494f567a Merge branch 'upstream-liblzma' into update-liblzma 
* upstream-liblzma:
  liblzma 2014-12-21 (265e5ffb)
 2018-08-06 10:24:00 -04:00
liblzma upstream 897b790d57 liblzma 2014-12-21 (265e5ffb) 
Code extracted from:

    https://git.tukaani.org/xz.git

at commit 265e5ffb70d9c175b424621576294d28807efd9b (v5.0.8).
 2018-08-06 10:23:59 -04:00
Brad King 78ec8b7552 liblzma: Avoid importing upstream makefiles 2018-08-06 10:23:06 -04:00
Brad King 83215720fb liblzma: Name sizeof size_t macro consistently with upstream 2018-08-06 10:23:01 -04:00
Brad King 6166adfdd4 liblzma: Revert "Port from C99 to C89/90" 
Revert commit v3.1.0-rc1~255^2~5 (liblzma: Port from C99 to C89/90,
2014-07-13).  We now compile as C99 or above except on MSVC where
we will use another approach.
 2018-08-06 10:22:56 -04:00
Brad King 0a3912112d liblzma: Revert "Avoid defining a 'restrict' macro" 
Revert commit v3.1.0-rc1~255^2~2 (liblzma: Avoid defining a 'restrict'
macro, 2014-07-24).  We will use another approach to deal with the
'restrict' keyword.
 2018-08-06 09:47:42 -04:00
Brad King 6038f0730a Merge topic 'update_maintainer_edit_label' 
670324bea2 Help: Update maintainer edit checkbox label

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2263
 2018-08-06 08:52:45 -04:00
Craig Scott 670324bea2 Help: Update maintainer edit checkbox label 
Recent GitLab updates have changed the label associated with the
checkbox in merge request descriptions for allowing edits from
maintainers. Make the contributor guidelines match the new label
and add a note for why it is recommended.
 2018-08-06 22:50:39 +10:00
Brad King 1d76991a41 Merge topic 'autogen_single_entry' 
87e7904c91 Autogen: Use a single AUTOGEN  setup function in cmGlobalGenerator

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2260
 2018-08-06 08:43:54 -04:00
Brad King d7a1bcd2e6 Merge topic 'xcode_schemes_config' 
6b7f1e1db0 Xcode: Add variables and properties to configure schemes
39c91d0703 cmGlobalGenerator: Add IsXcode query

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1803
 2018-08-06 08:25:50 -04:00
Brad King d64e41ac48 Merge topic 'nag-fortran-rsp' 
10d6c3a635 NAG: Pass response files through front-end to the linker

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2250
 2018-08-06 08:24:43 -04:00
Brad King 7f981dcf0e Merge topic 'xl-exe-pic' 
c2856e0b2b XL: Use -qpic for position independent executables

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2249
 2018-08-06 08:24:04 -04:00
Brad King be095b3e7f Merge topic 'FindMatlab-mcc' 
f34f6eb3d1 FindMatlab: Add component to find MCC, the Matlab compiler

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2233
 2018-08-06 08:23:14 -04:00
Brad King bed7ee11b7 Merge topic 'FindMatlab-cross-compile' 
3434c22c29 FindMatlab: only search registry on windows hosts

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2248
 2018-08-06 08:22:28 -04:00