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

36615 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brad King
e5c762d32d Merge topic 'server-target-backtraces' 
0c572382 server: Report backtraces in codemodel response
4db32275 server: Rename cmServerProtocol1_0 to cmServerProtocol1

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !992
 2017-07-13 07:44:11 -04:00
Brad King
c8f4cf0821 Merge topic 'source-group-regex-tweaks' 
2c82d9c8 Add more extensions to Resources source group by default

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1028
 2017-07-13 07:42:42 -04:00
Kitware Robot
3d209acc1f CMake Nightly Date Stamp 2017-07-13 00:01:06 -04:00
Brad King
75cbc5611d Merge branch 'release-3.8' 2017-07-12 13:38:02 -04:00
Brad King
23fb573c5f Merge branch 'backport-ep-log-no-extract-fix' into release-3.8 2017-07-12 13:37:54 -04:00
Ben Boeckel
627422d9de ExternalProject: only append COMMAND if actually adding a command 
Fixes #17046.

(cherry picked from commit 99d6de6c1a5871ba03fa008c984cd5408940c3cd)
 2017-07-12 11:33:07 -04:00
Brad King
ca7f6c3451 Merge branch 'release-3.9' 2017-07-12 10:27:25 -04:00
Brad King
25b72e9097 CMake 3.9.0-rc6 v3.9.0-rc6 2017-07-12 09:20:01 -04:00
Brad King
5b67090d9f Merge branch 'release-3.9' 2017-07-12 09:19:25 -04:00
Brad King
e63472abc5 Merge topic 'android-fix-c++_shared' 
e0fb3f31 Android: Link to android_support with c++_shared

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1048
 2017-07-12 09:00:43 -04:00
Brad King
ff9321a18a Merge topic 'vs-2017-sln-guid' 
5cf9c3d0 VS: Add SolutionGuid to generated .sln files

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1042
 2017-07-12 08:59:26 -04:00
Brad King
083a5cad0e Merge topic 'find_package-root-prefix-path-suffixes' 
80b905f8 find_*: Honor PATH_SUFFIXES in PackageName_ROOT paths
1ae1b880 cmFindCommon: Drop unused FilterPaths method
cca8454e cmFindCommon: Fix typo in PackageName_ROOT path label

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Chuck Atkins <chuck.atkins@kitware.com>
Merge-request: !1044
 2017-07-12 08:59:07 -04:00
Brad King
7020833841 Merge topic 'bindexplib-revert-consts' 
3250b9a1 bindexplib: Revert support for constants symbols

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1041
 2017-07-12 08:58:36 -04:00
Brad King
e8e38aea26 Merge branch 'android-fix-c++_shared' into release-3.9 2017-07-12 08:39:55 -04:00
Brad King
e0fb3f314f Android: Link to android_support with c++_shared 
The NDK has done this in `build/core/definitions.mk` since r13
(r12 and below do so only for c++_static).
 2017-07-12 08:39:42 -04:00
Kitware Robot
fadcfd4b89 CMake Nightly Date Stamp 2017-07-12 00:01:06 -04:00
Brad King
c42c039d32 Merge branch 'vs-2017-sln-guid' into release-3.9 2017-07-11 10:42:21 -04:00
Brad King
5cf9c3d0cc VS: Add SolutionGuid to generated .sln files 
Visual Studio 2017 Update 3 adds a SolutionGuid to its `.sln` files.

Fixes: #17041
 2017-07-11 10:41:28 -04:00
Brad King
7638c6ea8d Merge branch 'find_package-root-prefix-path-suffixes' into release-3.9 2017-07-11 09:20:37 -04:00
Brad King
80b905f882 find_*: Honor PATH_SUFFIXES in PackageName_ROOT paths 
This was accidentally forgotten in commit v3.9.0-rc1~71^2~2 (find_*: Add
a new PackageRoot search path group, 2017-05-03).

Fixes: #17052
 2017-07-11 09:11:19 -04:00
Brad King
1ae1b880a8 cmFindCommon: Drop unused FilterPaths method 
The method has not been used since commit v3.2.0-rc1~400^2~1
(Encapsulate search path manipulation functions into a seperate class,
2014-10-15).
 2017-07-11 09:11:19 -04:00
Brad King
cca8454ee5 cmFindCommon: Fix typo in PackageName_ROOT path label 2017-07-11 09:11:19 -04:00
Ivan Shcherbakov
0c57238215 server: Report backtraces in codemodel response 
Report the source locations (e.g. in `CMakeLists.txt`) for all targets
and target-related statements.  This allows IDEs to locate the
statements and automatically edit them when the user adds or removes
files or changes target properties via GUI.

Increment the protocol minor version number to tell clients that the new
information is available.
 2017-07-11 07:50:22 -04:00
Brad King
107a92ea9a Merge branch 'release-3.9' 2017-07-11 07:42:09 -04:00
Brad King
79e72f4b7c Merge topic 'FindMFC-try-static' 
6b2bf575 FindMFC: Check for static MFC variant

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1034
 2017-07-11 07:39:15 -04:00
Brad King
de72d5dda6 Merge topic 'file-LOCK-windows-message' 
efaf987a cmFileLockResult: Avoid allocation for Windows error message

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1035
 2017-07-11 07:38:54 -04:00
Brad King
970569a941 Merge topic 'vs-2017-choose-via-environment' 
2644e4c9 VS: Choose VS 2017 instance via environment variable

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1030
 2017-07-11 07:37:42 -04:00
Brad King
a49b235db9 Merge topic 'autogen_skip_included' 
ecac50e1 Autogen: Skip included files on demand

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1039
 2017-07-11 07:35:56 -04:00
Brad King
59e52b3041 Merge topic 'doc_configure_file' 
c7d81e16 Help: Explicitly state that some file generations are lazy

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1025
 2017-07-11 07:35:27 -04:00
Brad King
8d5ec21928 Merge topic 'FindPkgConfig-rerun' 
3cf267cf FindPkgConfig: do not always rerun pkg_check_modules() with 2 arguments

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1036
 2017-07-11 07:34:58 -04:00
Brad King
8f63f3495d Merge topic 'FindHDF5-windows' 
6848ff4c FindHDF5: Define H5_BUILT_AS_DYNAMIC_LIB when using Windows DLLs
6f131f49 FindHDF5: Add support for HDF5_USE_STATIC_LIBRARIES on Windows

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1023
 2017-07-11 07:34:23 -04:00
Kitware Robot
e1476f9618 CMake Nightly Date Stamp 2017-07-11 00:01:08 -04:00
Brad King
6fba4ec0f5 Merge branch 'bindexplib-revert-consts' into release-3.9 2017-07-10 14:54:30 -04:00
Brad King
3250b9a122 bindexplib: Revert support for constants symbols 
Revert the main logic change of commit v3.9.0-rc1~192^2 (bindexplib: fix
constants symbols export, 2017-04-26) and its test case.  Unfortunately
some constants may be provided by multiple object files with different
`@...` suffixes, leading to ambiguous references.  Revert support
pending further investigation.

Fixes: #17045
 2017-07-10 14:54:07 -04:00
UfoXp
2c82d9c81f Add more extensions to Resources source group by default 
Extend the Resources group regex to match pdf, png, jpeg, jpg,
storyboards, and xcassets.  This cleans up more complex Xcode projects a
lot.

While at it, factor the regular expressions for both "Resources" and
"Source Files" into macros.
 2017-07-10 11:33:56 -04:00
Rolf Eike Beer
3cf267cfbf FindPkgConfig: do not always rerun pkg_check_modules() with 2 arguments 
Since commit v3.8.0-rc1~47^2 (FindPkgConfig: Recheck pkg-config on
parameter change, 2017-01-17) calling `pkg_check_modules` always
re-runs.  The problem is that if there are only 2 arguments passed to
`pkg_check_modules```, then `_module0` will be set and `ARGN` will be
empty.  When this is written to cache it will be stored as just the
value of `_module0` without any semicolon, so on the next run this
doesn't match the expected value and the search is rerun.

Revise the logic to handle the case of empty `ARGN` separately.

Fixes: #17003
 2017-07-10 11:16:51 -04:00
Brad King
dd69dea3e7 Merge branch 'vs-2017-choose-via-environment' into release-3.9 2017-07-10 11:08:27 -04:00
Brad King
2644e4c9fc VS: Choose VS 2017 instance via environment variable 
In the `Visual Studio 15 2017` generator, if the `VS150COMNTOOLS`
environment variable points at a specific VS 2017 instance reported by
the Visual Studio Installer tool, use that as the preferred instance.

Inspired-by: Iyyappa Murugandi <iyyappam@microsoft.com>
Fixes: #16846
 2017-07-10 11:08:11 -04:00
Brad King
f7f721d40a Merge branch 'autogen_skip_included' into release-3.9 2017-07-10 10:26:32 -04:00
Brad King
1fda77d455 Merge branch 'release-3.9' 2017-07-10 10:23:56 -04:00
Brad King
41be8a739e Merge topic 'autogen-no-generated-files' 
9a34e95a Autogen: Skip generated files for compatibility with CMake 3.8

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1033
 2017-07-10 10:22:00 -04:00
Brad King
4bf96ed9b0 Merge topic 'find_package-restore-considered-configs' 
e7730d78 find_package: Restore longer message when config files were considered

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1032
 2017-07-10 10:21:23 -04:00
Brad King
9eaf0fea28 Merge topic 'indented_cmakedefine' 
58f47448 configure_file: Add support for indented cmakedefine

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1024
 2017-07-10 10:21:00 -04:00
Sebastian Holtermann
ecac50e133 Autogen: Skip included files on demand 2017-07-10 13:36:48 +02:00
Kitware Robot
fc58819150 CMake Nightly Date Stamp 2017-07-10 00:01:09 -04:00
Kitware Robot
e09252f5d2 CMake Nightly Date Stamp 2017-07-09 00:01:09 -04:00
Kitware Robot
0ba4a4c36f CMake Nightly Date Stamp 2017-07-08 00:01:05 -04:00
Iyyappa Murugandi
efaf987ad1 cmFileLockResult: Avoid allocation for Windows error message 2017-07-07 14:04:20 -04:00
Brad King
9b9a57e16b Merge branch 'autogen-no-generated-files' into release-3.9 2017-07-07 11:44:35 -04:00
Brad King
916b7d5195 Merge branch 'find_package-restore-considered-configs' into release-3.9 2017-07-07 11:44:29 -04:00