reactos/CMake
1
0
Fork 0
mirror of https://github.com/reactos/CMake.git synced 2025-03-07 11:27:10 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
36,169 Commits 4 Branches 185 Tags
b398e716f9
Commit Graph

36169 Commits

Author SHA1 Message Date
Brad King
561e5edc3c Merge topic 'FindProtobuf-targets' 
37627217 Help: Add notes for topic 'FindProtobuf-targets'
e4e1d194 FindProtobuf: add tests
f29635b6 FindProtobuf: add targets

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request:
2017-05-19 14:17:50 -04:00
Brad King
a2f1c8bd98 Merge topic 'liblzma-fix-inline' 
fb6142ab liblzma: Fix HAVE_INLINE and HAVE___INLINE checks

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request:
2017-05-19 14:16:53 -04:00
Florian Schmaus
4773228061 UseEcos: Fix for separate <DEFINES> and <INCLUDES> placeholders 
Update the module to account for commit v3.4.0-rc1~342^2 (Factor an
<INCLUDES> placeholder out of <FLAGS> in rule variables, 2015-07-13)
and v2.6.0~537 (Create COMPILE_DEFINITIONS property for targets and
source files, 2008-01-14).

Fixes:
2017-05-19 10:51:09 -04:00
Brad King
f74f01fe69 Check C++ features even without CMAKE_CXX_STANDARD for CMake itself 
When using `CMake_NO_CXX_STANDARD` a user may still provide `-std=c++11`
or similar flags in `CMAKE_CXX_FLAGS`, so we should still check for the
available C++ features.
 2017-05-19 09:22:38 -04:00
Chuck Atkins
fe8f08d268 find_*: Add docs for PackageRoot search path group 2017-05-19 08:46:02 -04:00
Kitware Robot
de41f3b38c CMake Nightly Date Stamp 2017-05-19 00:01:06 -04:00
Craig Scott
94cd4505f7 Tests: Make function name not match SONAME 
We look for `SONAME` in the output of `readelf` to check whether the
binary contains the field.  Do not provide a symbol that may
accidentally match.

Fixes:
2017-05-18 10:26:09 -04:00
Brad King
87a37e6475 cmComputeTargetDepends: Avoid nested loops over configurations 
`AddInterfaceDepends` is only called from `CollectTargetDepends` inside
our loop over all configurations so it doesn't need its own such loop.
 2017-05-18 10:18:57 -04:00
Brad King
5a913794d2 cmComputeTargetDepends: Avoid computing with empty configuration 
Fix `AddInterfaceDepends` to combine all configurations using the
same approach that `CollectTargetDepends` does.

Fixes:
2017-05-18 10:18:53 -04:00
Brad King
70c6557285 Tests: Fix RunCMake.CMP0022 tll case for Debug configuration 
The `CMP0022-WARN-tll` case overrides legacy properties set by
`target_link_libraries` so that we can verify that the policy
warning is emitted.  When building in the Debug configuration,
the `_DEBUG` variant of the legacy property is set/checked too.

Fix the test case to override both variants.  Previously it only
passed because `cmComputeTargetDepends::AddInterfaceDepends`
always evaluated dependencies with the "" configuration.
 2017-05-18 10:18:50 -04:00
Brad King
3762721708 Help: Add notes for topic 'FindProtobuf-targets' 2017-05-18 09:26:42 -04:00
Brad King
bc7d64f896 Merge topic 'string-append' 
9e24af01 Use string(APPEND) in Modules

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request:
2017-05-18 09:03:40 -04:00
Brad King
44f8f839cb Merge topic 'cpack-archive-per-component-filename' 
9e06e97d CPack/Archive: per component filenames support

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request:
2017-05-18 09:01:57 -04:00
Brad King
10371cd6dc Merge topic 'source_group-TREE-relative-path' 
4716f2be source_group: Restore TREE support for relative paths

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request:
2017-05-18 08:53:51 -04:00
Brad King
21916a4784 Merge topic 'vs14-GNUtoMS' 
c02d4d2a GNUtoMS: Add search path for VS 2015 environment scripts

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request:
2017-05-18 08:53:23 -04:00
Brad King
a38176b177 Merge topic 'rel-osx-qt-version' 
3e41abbd Utilities/Release: Switch macOS binary to Qt 5.6.2

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request:
2017-05-18 08:52:13 -04:00
Brad King
b86c5e8003 Merge topic 'fix-invalid-export-name' 
8d754ad5 bindexplib: Skip symbols containing a dot (.)

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request:
2017-05-18 08:50:47 -04:00
Brad King
23b3d46e96 Merge topic 'update-kwsys' 
16ebd9f6 Merge branch 'upstream-KWSys' into update-kwsys
7be70ca6 KWSys 2017-05-16 (fe1f22ce)

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request:
2017-05-18 08:48:48 -04:00
Brad King
cb8325fb4a Merge topic 'ninja-compile_commands.json' 
b554caf7 Ninja: List compile_commands.json as generated by CMake

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request:
2017-05-18 08:47:47 -04:00
Brad King
3738871626 Merge topic 'removeSetModulePath' 
0fb0f346 Tests: Remove unnecessary setting of CMAKE_MODULE_PATH

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request:
2017-05-18 08:47:04 -04:00
Brad King
6b1e35d207 Merge topic 'gtest_add_tests' 
6edd1806 GoogleTest: Expand capabilities of gtest_add_tests()

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request:
2017-05-18 08:46:02 -04:00
Brad King
d7e32c1cd6 Merge topic 'update-libuv' 
223d92e0 libuv: Update build within CMake
ed17516b Merge branch 'upstream-libuv' into update-libuv
12a78bc8 libuv 2017-05-09 (e11dcd43)

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request:
2017-05-18 08:43:17 -04:00
André Apitzsch
e4e1d194bd
FindProtobuf: add tests 2017-05-18 13:57:01 +02:00
André Apitzsch
f29635b667
FindProtobuf: add targets 2017-05-18 13:57:01 +02:00
Kitware Robot
d1233a38cb CMake Nightly Date Stamp 2017-05-18 00:01:04 -04:00
Craig Scott
1bfe37201a Tests: Ensure Solaris linker never sees empty contents 
Fixes the following tests on Solaris builds: wrapping, qtwrapping and
CMakeCommands.target_link_libraries
 2017-05-18 10:32:03 +10:00
Brad King
2e6cbd9871 Merge topic 'note-unstage-before-update' 
1c25adb2 Help/dev: note that unstaging before an update is unnecessary

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request:
2017-05-17 15:10:54 -04:00
Brad King
fb6142ab2f liblzma: Fix HAVE_INLINE and HAVE___INLINE checks 
The checks fail even on compilers that support the keywords because
the linkage is broken:

    src.c:...: undefined reference to 'test'

At the actual use sites we use `static inline` instead of just `inline`,
so perform the check this way too to fix the linkage.
 2017-05-17 15:00:16 -04:00
Daniel Pfeifer
9e24af0137 Use string(APPEND) in Modules 
Automate with:

find Modules -type f -print0 | xargs -0 perl -i -0pe \
  's/set\(([a-zA-Z0-9_\$\{\}]+)(\s+)"\$\{\1\}([^"])/string(APPEND \1\2"\3/g'
 2017-05-17 11:26:11 -06:00
Ben Boeckel
1c25adb210 Help/dev: note that unstaging before an update is unnecessary 2017-05-17 13:05:00 -04:00
Brad King
1558f30cea Merge branch 'vs14-GNUtoMS' into release 2017-05-17 11:19:54 -04:00
Alex Ghosh
c02d4d2aee GNUtoMS: Add search path for VS 2015 environment scripts 2017-05-17 11:19:23 -04:00
Brad King
3e41abbda1 Utilities/Release: Switch macOS binary to Qt 5.6.2 
Update from 5.6.0.
 2017-05-17 09:38:42 -04:00
Brad King
93cadfc2b5 Merge branch 'source_group-TREE-relative-path' into release 2017-05-17 09:07:00 -04:00
Mateusz Janek
4716f2be83 source_group: Restore TREE support for relative paths 
The fix in commit v3.8.1~4^2 (source_group: Fix TREE with root that is
not current source dir, 2017-04-20) accidentally broke support for
specifying paths relative to the source directory.  Fix it and add a
test covering the case.

While at it, fix a typo in a variable name.

Fixes:
2017-05-17 09:04:02 -04:00
Kitware Robot
3f25f873f8 CMake Nightly Date Stamp 2017-05-17 00:01:05 -04:00
Domen Vrankar
9e06e97d30 CPack/Archive: per component filenames support 
Support for setting archive packager specific
per component filenames and monolithic package
filenames.
 2017-05-17 00:47:15 +02:00
Chuck Atkins
57744ca9c0 find_*: Add tests for PackageRoot search path group 2017-05-16 15:19:45 -04:00
Chuck Atkins
ef3d360a3d find_*: Add a new PackageRoot search path group 
The new PackageRoot search path group allows the PackageName_ROOT cmake
and environment variables to be used as search prefixes for all find_*
commands called from within a find module
 2017-05-16 15:19:40 -04:00
Brad King
16ebd9f615 Merge branch 'upstream-KWSys' into update-kwsys 
* upstream-KWSys:
  KWSys 2017-05-16 (fe1f22ce)
 2017-05-16 11:39:01 -04:00
KWSys Upstream
7be70ca6cc KWSys 2017-05-16 (fe1f22ce) 
Code extracted from:

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

at commit fe1f22ceefdae18df33e5bab8483fec7a82d4cee (master).

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

Adam Weisi (3):
      8a799e36 Process: Improve definition ordering in header file
      7d56ef24 Process: Save results from all children internally
      b7eba998 Process: Add APIs to get results of individual processes

Ben Boeckel (2):
      cea71543 style: remove separator comments
      874dc559 style: help clang-format near macros
 2017-05-16 11:39:00 -04:00
Brad King
6b05e028f1 Merge branch 'release' 2017-05-16 11:33:02 -04:00
Albert Ziegenhagel
8d754ad5e7 bindexplib: Skip symbols containing a dot (.) 
Symbols including a dot are not valid and result in a `LNK1242` error
when trying to create a library from the def file.  Such symbols happen
to be in object files when using PGI Fortran on Windows and compiling
with debug symbols enabled.  Those symbols do not need to be exported.
 2017-05-16 11:22:48 -04:00
Kevin Puetz
b554caf753 Ninja: List compile_commands.json as generated by CMake 
This fixes a false-positive `CMP0058` warning if any custom rules depend
on `compile_commands.json` (e.g. to trigger rerunning clang-tooling
utilities).

Fixes:
2017-05-16 10:21:22 -04:00
Brad King
e69e4448fb Merge topic 'xcode-try_compile-scheme' 
c608000a Xcode: Work around xcodebuild spurious hangs in try_compile
b8e707a6 Xcode: Refactor internal decision for scheme generation

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request:
2017-05-16 09:57:47 -04:00
Brad King
8475734cb3 Merge topic 'early-config-name' 
eeb47fbe cmLocalCommonGenerator: Save CMAKE_BUILD_TYPE on construction

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request:
2017-05-16 09:55:51 -04:00
Brad King
ef8ac5ad5a Merge topic 'cpackifw-i18n' 
72ac7ad9 CPackIFW: Internationalization Support

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request:
2017-05-16 09:55:29 -04:00
Brad King
0789a8be08 Merge topic 'extra-fphsa-space' 
3c515e19 FPHSA: remove extra space

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request:
2017-05-16 09:54:09 -04:00
Brad King
80e0ef4082 Merge topic 'GNU-FindBinUtils-patterns' 
75accaae GCC: more patterns for ar/ranlib

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request:
2017-05-16 09:53:32 -04:00
Brad King
67d5593efa Merge topic 'mingw-w64-compile' 
9557b403 cmFileCommand: Fix build on mingw-w64
845f5e3c bootstrap: fix build on mingw-w64

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request:
2017-05-16 09:52:42 -04:00