reactos/CMake
1
0
Fork 0
mirror of https://github.com/reactos/CMake.git synced 2025-02-10 05:42:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
40,118 Commits 4 Branches 185 Tags
Commit Graph

40118 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Kyle Edwards
bce8fa229a Tests: Add test for CONFIGURATIONS parameter of install() 2018-07-17 09:07:01 -04:00
Kyle Edwards
ae1c917f1a Tests: Add test for install(<SCRIPT|CODE>) 2018-07-17 09:07:01 -04:00
Kyle Edwards
2c62a45a5a Tests: Add test for <PRE|POST>_INSTALL_SCRIPT 2018-07-17 09:07:01 -04:00
Kyle Edwards
db4bc2fa18 Tests: Add test for deprecated install_*() commands 2018-07-17 09:07:01 -04:00
Kyle Edwards
ec5c838fcb Tests: Add tests for *OUTPUT_NAME properties 2018-07-17 09:07:00 -04:00
Kyle Edwards
f6c7358c2a Tests: Add test for install(DIRECTORY ... OPTIONAL) 2018-07-17 09:07:00 -04:00
Kyle Edwards
1638ffa287 Tests: Add tests for install(<TARGETS|FILES> ... OPTIONAL) 2018-07-17 09:07:00 -04:00
Brad King
f84bcc1bf5 Merge branch 'release-3.12' 2018-07-17 08:36:25 -04:00
Brad King
f84c15ef2f CMake 3.12.0 v3.12.0 2018-07-17 07:18:36 -04:00
Brad King
7ebc06fb02 Merge topic 'math-err' 
406f397e8b math: Restore toleration of unexpected characters in an expression
dd5c54600b cmExprParserHelper: Simplify error state tracking
185bcface4 cmExprParserHelper: Remove some unused code

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2218
 2018-07-17 07:14:48 -04:00
Brad King
e78fc81d4a Merge topic 'FindProtobuf-upstream-impl' 
71d99e156b Protobuf: restore previous output directory
2ae2d0bd3e Protobuf: restore 'DESCRIPTORS' support
1385b4b113 Protobuf: restore 'PROTOBUF_IMPORT_DIRS' check
1bcc0f3678 Protobuf: use upstream implementation to generate cpp and python files

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2212
 2018-07-17 07:13:18 -04:00
Brad King
e08f02b928 Merge topic 'hex_file' 
5f431789a9 Use isxdigit() to determine if a character is a hex digit

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2213
 2018-07-17 07:12:29 -04:00
Brad King
689ce111a8 Merge topic 'FindOpenCL-arch-paths' 
dee7bafb13 FindOpenCL: Search per-architecture path suffixes on UNIX

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2215
 2018-07-17 07:11:38 -04:00
Kitware Robot
328410f26b CMake Nightly Date Stamp 2018-07-17 00:01:08 -04:00
Brad King
406f397e8b math: Restore toleration of unexpected characters in an expression 
Prior to commit 7c4c13ffef (math: Reject unexpected expression input
explicitly, 2018-05-18) we ignored unexpected characters in an
expression that otherwise can be parsed.  In order to preserve
compatibility with projects that accidentally used this, convert the
error to a warning.
 2018-07-16 14:46:43 -04:00
Brad King
dd5c54600b cmExprParserHelper: Simplify error state tracking 
Errors always have explanation strings, so use the presence of such a
string to track whether an error has occurred.  This avoids an extra
variable.
 2018-07-16 13:04:06 -04:00
Brad King
185bcface4 cmExprParserHelper: Remove some unused code 2018-07-16 11:12:34 -04:00
Brad King
de342066d3 Merge branch 'release-3.12' 2018-07-16 09:07:38 -04:00
Brad King
42065828c3 Merge topic 'doc-add_library-IMPORTED_OBJECTS' 
62b4df1e84 Help: Mention IMPORTED_OBJECTS in add_library docs

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2216
 2018-07-16 09:07:23 -04:00
André Apitzsch
71d99e156b Protobuf: restore previous output directory 
The protobuf upstream implementation has a different default output
directory.  Restore our original output directory for compatibility.
 2018-07-16 08:59:36 -04:00
André Apitzsch
2ae2d0bd3e Protobuf: restore 'DESCRIPTORS' support 
This was not present in the upstream code.
 2018-07-16 08:59:33 -04:00
André Apitzsch
1385b4b113 Protobuf: restore 'PROTOBUF_IMPORT_DIRS' check 
This was not present in the upstream code.
 2018-07-16 08:59:21 -04:00
André Apitzsch
1bcc0f3678 Protobuf: use upstream implementation to generate cpp and python files 
Generate functions are taken from [1] and [2].  The license [3] is
already covered by our BSD-3 license for CMake and our inclusion of
"Google Inc" in `Copyright.txt`.

[1] https://github.com/google/protobuf/blob/93f6b67e/cmake/protobuf-config.cmake.in
[2] https://github.com/google/protobuf/blob/93f6b67e/cmake/protobuf-module.cmake.in
[3] https://github.com/google/protobuf/blob/93f6b67e/LICENSE
 2018-07-16 08:57:08 -04:00
Anton Myagkov
dee7bafb13 FindOpenCL: Search per-architecture path suffixes on UNIX 
Use different path suffixes to find opencl for x86 and x86_64.
We already do this on Windows.
 2018-07-16 08:27:08 -04:00
Brad King
4b00e57de8 Merge topic 'FindXercesC-versioned-names' 
82f39c9ce9 FindXercesC: Search for version-named library files

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Roger Leigh <rleigh@codelibre.net>
Merge-request: !2210
 2018-07-16 08:21:55 -04:00
Brad King
d240bb9a41 Merge branch 'doc-add_library-IMPORTED_OBJECTS' into release-3.12 
Merge-request: !2216
 2018-07-16 08:19:35 -04:00
Brad King
62b4df1e84 Help: Mention IMPORTED_OBJECTS in add_library docs 
The `IMPORTED_OBJECTS` is to object libraries as `IMPORTED_LOCATION`
is to normal libraries.

Fixes: #18176
 2018-07-16 08:17:51 -04:00
Kitware Robot
992e9d10f8 CMake Nightly Date Stamp 2018-07-16 00:01:04 -04:00
Kitware Robot
1a1eeda75a CMake Nightly Date Stamp 2018-07-15 00:01:05 -04:00
Kitware Robot
c960907105 CMake Nightly Date Stamp 2018-07-14 00:01:13 -04:00
Devin Nakamura
5f431789a9 Use isxdigit() to determine if a character is a hex digit 
Replace custom cm_IsHexChar with isxdigit from the stdlib
 2018-07-13 13:55:39 -04:00
Raul Metsma
82f39c9ce9 FindXercesC: Search for version-named library files 
Use the version number extracted from the header file to construct
versioned library names.  This approach is already used by `FindXalanC`.

Signed-off-by: Raul Metsma <raul@metsma.ee>
 2018-07-13 09:01:47 -04:00
Brad King
102f51d0aa Merge topic 'autogen_forward_errors' 
86b332c25d Return std::string from cmGeneratorTarget::ImportedGetLocation
189f723509 Autogen: Wrap moc/uic/rcc related variables in structs
c6a8002827 Autogen: Improve error detection during configuration

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2207
 2018-07-13 08:57:36 -04:00
Brad King
f691dbc485 Merge topic 'cpack-wix-extra-sources' 
f2134169f6 WiX: Add the build directory to IncludeSearchPaths for candle.exe

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2194
 2018-07-13 08:57:09 -04:00
Brad King
969ad5b33e Merge branch 'release-3.12' 2018-07-13 08:55:33 -04:00
Brad King
0d72c50d29 Merge topic 'intel-std-fix' 
735e69f445 Intel: Fix incorrectly documented extension flags

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2206
 2018-07-13 08:54:47 -04:00
Brad King
718d2f8f16 Merge topic 'boost-1.68-beta1' 
b76b93c728 FindBoost: Change context header used
c8a7835ea9 FindBoost: Add support for Boost 1.68 beta1

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Alexander Grund <github@grundis.de>
Merge-request: !2204
 2018-07-13 08:54:16 -04:00
Brad King
00afb11b07 Merge topic 'update-kwsys' 
c5a1491e90 Merge branch 'upstream-KWSys' into update-kwsys
c454a1435a KWSys 2018-07-12 (86ce4f37)

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2211
 2018-07-13 08:53:21 -04:00
Kitware Robot
4d9d674cf2 CMake Nightly Date Stamp 2018-07-13 00:01:06 -04:00
Brad King
bfb025f04b Merge branch 'release-3.12' 2018-07-12 09:37:36 -04:00
Brad King
e109dc0b2a Merge branch 'intel-std-fix' into release-3.12 
Merge-request: !2206
 2018-07-12 09:36:30 -04:00
Christian Pfeiffer
735e69f445 Intel: Fix incorrectly documented extension flags 
Fixes: #18166
 2018-07-12 09:35:50 -04:00
Brad King
f7f2b8078e Merge topic 'qnx_fix' 
e014df762b QNX: Fix autogen compiler predefines detection

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2205
 2018-07-12 09:15:58 -04:00
Brad King
f6f5f9f75f Merge topic 'ghs' 
ce4f20ba62 GHS: Add release notes
281c601024 GHS: Update default BSP name
01c98c6ccc GHS: Update setting default OS location for Integrity platforms
bb77dc0cee GHS: Set primary target using arch/platform values (or user specified value)
f80692cf60 GHS: Add platform selection support
a37a4a00c8 GHS: Add toolset selection support
5d40d2b44f GHS: Support ARM, PPC, 86 architectures

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Matt Soucy <matthew.soucy@baesystems.com>
Merge-request: !798
 2018-07-12 09:15:18 -04:00
Brad King
7b04ad61cf Merge topic 'option_respects_existing_stack_variable' 
f8a7cf85ad option: No CMP077 warnings when both cache and local variable exists

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2203
 2018-07-12 09:12:26 -04:00
Brad King
384c3f9e9e Merge branch 'boost-1.68-beta1' into release-3.12 
Merge-request: !2204
 2018-07-12 09:10:02 -04:00
Brad King
c5a1491e90 Merge branch 'upstream-KWSys' into update-kwsys 
* upstream-KWSys:
  KWSys 2018-07-12 (86ce4f37)
 2018-07-12 08:47:15 -04:00
KWSys Upstream
c454a1435a KWSys 2018-07-12 (86ce4f37) 
Code extracted from:

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

at commit 86ce4f37437685728662ab6edcf8cf7b6154d649 (master).

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

Devin Nakamura (1):
      2cbf13d2 Terminal: Add support for z/OS terminal
 2018-07-12 08:47:14 -04:00
Brad King
730c8b8727 Merge branch 'qnx_fix' into release-3.12 
Merge-request: !2205
 2018-07-12 08:41:20 -04:00
Lars Schmertmann
f2134169f6 WiX: Add the build directory to IncludeSearchPaths for candle.exe 
CPack creates cpack_variables.wxi in the build directory. In the WiX
template it can be used by <?include "cpack_variables.wxi"?> because
the template is configured into main.wxs in the build directory.
Because the extra source files are in the source directory it was necessary to use
<?include "$(sys.CURRENTDIR)_CPack_Packages\win32\WIX\cpack_variables.wxi"?>.
This requires knowledge about the build directory structure and
is avoided by this change by adding the build directory to the IncludeSearchPaths.
 2018-07-12 08:48:33 +02:00