reactos/CMake
1
0
Fork 0
mirror of https://github.com/reactos/CMake.git synced 2024-12-04 01:22:28 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
37,195 Commits 4 Branches 185 Tags 113 MiB
e48acfc501
Commit Graph

37195 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sebastian Holtermann
3a4840e039 Autogen: Make test per-config include directory compatible 2017-08-05 11:21:44 +02:00
Kitware Robot
7c7a57ce9e CMake Nightly Date Stamp 2017-08-05 00:01:06 -04:00
Brad King
acd462dd31 README: Add AIX to list of supported platforms 
It was left out accidentally.
 2017-08-04 09:45:03 -04:00
Brad King
eed33adc6a Merge branch 'release-3.9' 2017-08-04 09:39:41 -04:00
Brad King
c2cc764582 Merge topic 'FindCygwin-64-bit' 
0184531a FindCygwin: Look for Cygwin in C:\Cygwin64.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1091
 2017-08-04 09:24:25 -04:00
Gerald Combs
0184531a63 FindCygwin: Look for Cygwin in C:\Cygwin64. 
Add "C:\Cygwin64" to the list of Cygwin search paths.
 2017-08-04 09:23:05 -04:00
Brad King
51f08783c2 Merge topic 'genex-error-grammar' 
e49c9eec cmGeneratorExpressionNode: add some missing commas

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1102
 2017-08-04 09:17:24 -04:00
Brad King
b745cb3e55 Merge topic 'file_WRITE_docs' 
d7472bbf file: Clarify directory creation behavior when using WRITE

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1088
 2017-08-04 09:16:46 -04:00
Brad King
70c326f0f1 Merge topic 'doc-file-GLOB-sorted' 
75ca5f04 Help: Document that file(GLOB) result is sorted

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1098
 2017-08-04 09:16:06 -04:00
Brad King
86a107cb5c Merge topic 'set_IAR_excetion_option' 
168b42d2 IAR: Enable extensions by default

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1081
 2017-08-04 09:15:14 -04:00
Brad King
c5c8ee1a9b Merge topic 'FindHDF5-importedconf-fix' 
4956fc26 FindHDF5: fixes for HL when using an imported config
4150048a FindHDF5: unset some variables
9310d008 FindHDF5: for a static imported config, use CONFIG-specific library
fc982844 FindHDF5: fix hdf5-config case with more than one configuration

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1064
 2017-08-04 09:14:31 -04:00
Brad King
496eed60f3 Merge topic 'doc-release-notes-orphan' 
9e225766 Help: Silence warning about document not included in toctree

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1077
 2017-08-04 09:12:12 -04:00
Brad King
15f1602584 Merge topic 'android-plain-sysroot' 
68d67c82 Android: Fix support for CMAKE_SYSROOT without CMAKE_SYSROOT_COMPILE

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1101
 2017-08-04 09:11:43 -04:00
Brad King
d4c2a58d13 Merge topic 'vs-VCTargetsPath-force-config' 
fe3b481b VS: Fix VCTargetsPath detection

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1100
 2017-08-04 09:10:57 -04:00
Brad King
18cbf898f8 Merge topic 'add-package_root-to-find_package' 
4a207116 find_package: Split PACKAGE_ROOT tests to work with smaller regex
9722ff5a find_package: Fix PACKAGE_ROOT test to check find_pacakge(CONFIG) mode.
c5d2b99c find_package: Add missing PACKAGE_ROOT_PATH search path implementation.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1082
 2017-08-04 09:09:59 -04:00
Kitware Robot
c9b3ad6f6b CMake Nightly Date Stamp 2017-08-04 00:01:06 -04:00
Brad King
8fb12ce7a2 Merge branch 'add-package_root-to-find_package' into release-3.9 
Merge-request: !1082
 2017-08-03 15:05:30 -04:00
Robert Dailey
d7472bbf16 file: Clarify directory creation behavior when using WRITE 
When using `file(WRITE)`, parent directories are also created. Documentation
has been updated to explain this behavior.

Co-Author: Craig Scott <craig.scott@crascit.com>
 2017-08-03 14:11:26 -04:00
Ruslan Baratov
75ca5f04df Help: Document that file(GLOB) result is sorted 
It has been sorted since commit v3.6.0-rc1~54^2 (file: Sort GLOB results
to make it deterministic, 2016-05-14).  That commit left the order
unspecified in the documentation, but has been stable long enough to
document now.
 2017-08-03 14:00:07 -04:00
Ben Boeckel
e49c9eec27 cmGeneratorExpressionNode: add some missing commas 2017-08-03 13:39:58 -04:00
Brad King
9d09d1a922 Merge branch 'android-plain-sysroot' into release-3.9 
Merge-request: !1101
 2017-08-03 12:47:11 -04:00
Brad King
68d67c827f Android: Fix support for CMAKE_SYSROOT without CMAKE_SYSROOT_COMPILE 
If `CMAKE_SYSROOT` is set by the user (e.g. via the toolchain file) then
we do not set `CMAKE_SYSROOT_COMPILE` to our default.  Fix our
references to the sysroot's `/usr/include` directory to use
`CMAKE_SYSROOT_COMPILE` only if it is set and else `CMAKE_SYSROOT`.

Fixes: #17096
 2017-08-03 12:03:59 -04:00
Brad King
cc08d0872c Merge branch 'vs-VCTargetsPath-force-config' into release-3.9 
Merge-request: !1100
 2017-08-03 12:00:05 -04:00
Brad King
fe3b481bab VS: Fix VCTargetsPath detection 
In some environments MSBuild chooses the `Release` configuration
even though only `Debug` is available in our detection project.
Force use of the `Debug` configuration with a command-line option.

Fixes: #17118
 2017-08-03 11:54:02 -04:00
Norbert Lange
168b42d247 IAR: Enable extensions by default 
Set the variable added by commit a2112257 (Add infrastructure to use
language extensions without any standard, 2017-06-29) for IAR.  This was
accidentally left out of commit d8e6cd9e (IAR: Improve support for IAR
ARM Compiler, 2017-06-15).
 2017-08-03 09:56:36 -04:00
Kris Thielemans
4956fc26b5 FindHDF5: fixes for HL when using an imported config 
- some variables did not have the appropriate HL infix
- some logic was not yet implemented for HL
 2017-08-03 09:49:47 -04:00
Kris Thielemans
4150048a3b FindHDF5: unset some variables 
prefixed some local variables with _hdf5 and unset them at the end
(still more of these to do)
 2017-08-03 09:49:47 -04:00
Kris Thielemans
9310d00822 FindHDF5: for a static imported config, use CONFIG-specific library 
first check the LOCATION_<CONFIG> propertiy to find the library, then
LOCATION
 2017-08-03 09:49:47 -04:00
Kris Thielemans
fc9828448d FindHDF5: fix hdf5-config case with more than one configuration 
Select a configuration as the first of the following available:

* MAP_IMPORTED_CONFIG_<CONFIG>
* ${CMAKE_BUILD_TYPE}, RELWITHDEBINFO, RELEASE, DEBUG
* First entry in IMPORTED_CONFIGURATIONS

Fixes: #17039
 2017-08-03 09:48:19 -04:00
Brad King
dcb01e97cd Merge branch 'doc-release-notes-orphan' into release-3.9 
Merge-request: !1077
 2017-08-03 09:39:13 -04:00
Brad King
a2bc632d06 Merge topic 'doc-buildsystem-fix' 
cc78ff72 Help: Fix example in cmake-buildsystem(7) manual

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1097
 2017-08-03 09:38:15 -04:00
Björn Esser
9e225766ae Help: Silence warning about document not included in toctree 
When not using the html or text builders, `Help/index.rst` does not
include `Help/release/index.rst` in the toctree.  Silence the warning.
 2017-08-03 09:36:08 -04:00
Brad King
17d236d5ba Merge branch 'release-3.9' 2017-08-03 09:35:14 -04:00
Brad King
ee79d7a130 Merge topic 'server-fix-crash' 
70272f3c server: Fix crash on missing cache entries

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1096
 2017-08-03 09:34:15 -04:00
Brad King
973ee6605b Merge topic 'UseSWIG-Java-enabled' 
b4fbf677 UseSWIG: Fix when Java is enabled as a language

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1095
 2017-08-03 09:33:57 -04:00
Kitware Robot
8e8bf42707 CMake Nightly Date Stamp 2017-08-03 00:01:09 -04:00
Craig Scott
54bc20dd8c Merge topic 'autogen-depends' 
a3a62fcc Autogen: Add AUTOMOC test for target dependencies forwarding
7fa9c550 Autogen: Forward target dependencies to *_autogen target

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1087
 2017-08-02 17:44:59 -04:00
Brad King
901456d76e Merge topic 'FindLibXml2-compat' 
d1a77565 FindLibXml2: Restore compatibility with projects setting LIBXML2_LIBRARIES

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1094
 2017-08-02 16:28:24 -04:00
Brad King
a7e4d595f9 Merge branch 'server-fix-crash' into release-3.9 
Merge-request: !1096
 2017-08-02 16:27:06 -04:00
Sebastian Nagel
cc78ff72eb Help: Fix example in cmake-buildsystem(7) manual 
In the example code `serialization` is a PRIVATE dependency of
`archiveExtras` and not of `archive`.  Fix the corresponding prose.
 2017-08-02 16:21:28 -04:00
Laurent Rineau
70272f3c36 server: Fix crash on missing cache entries 
Test for nullptr before constructing std::string.
 2017-08-02 16:13:55 -04:00
Chuck Atkins
4a20711690 find_package: Split PACKAGE_ROOT tests to work with smaller regex 2017-08-02 12:03:52 -04:00
Brad King
1181ad61d2 Merge branch 'UseSWIG-Java-enabled' into release-3.9 
Merge-request: !1095
 2017-08-02 11:56:07 -04:00
Brad King
b4fbf677bb UseSWIG: Fix when Java is enabled as a language 
Since commit v3.8.0-rc1~251^2 (UseSWIG: Record generated java files as
custom command outputs, 2016-11-28) the generated `.java` files are
listed as sources in the call to `add_library` by swig_add_library.
They are listed only as the outputs of custom commands and not intended
for compilation as part of the library.

Reported-by: Alan W. Irwin <irwin@beluga.phys.uvic.ca>
 2017-08-02 11:52:36 -04:00
Brad King
6bef326eb4 Merge topic 'update-libarchive' 
c80d8cb2 libarchive: Fix inclusion of zlib, bzlib, and lzma for build within CMake
6df1bda1 Merge branch 'upstream-LibArchive' into update-libarchive
11f3dcb0 LibArchive 2017-07-09 (98a69539)
b6674431 libarchive: Update script to get 3.3.2

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1071
 2017-08-02 11:45:35 -04:00
Brad King
83c8663910 Merge branch 'release-3.9' 2017-08-02 11:42:56 -04:00
Brad King
155dc75b89 Merge topic 'FindJava-fix-1.6-registry' 
5479074b FindJava: fix hint for windows jre 1.6

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1079
 2017-08-02 11:42:07 -04:00
Brad King
b162e5c0f0 Merge topic 'sphinx-pre-1.2' 
2a68ff7f Utilities/Sphinx: Restore compatibility with Sphinx pre-1.2

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1089
 2017-08-02 11:41:44 -04:00
Brad King
39bd20a490 Merge branch 'FindJava-fix-1.6-registry' into release-3.9 
Merge-request: !1079
 2017-08-02 11:31:27 -04:00
Rechi Rechi
5479074be1 FindJava: fix hint for windows jre 1.6 
Fix typo in commit v3.8.0-rc1~112^2 (FindJava: add hints for jre,
2017-01-11).
 2017-08-02 11:30:48 -04:00