mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-05-24 17:18:37 -05:00
Code Issues Packages Projects Releases Wiki Activity
36,804 Commits 2 Branches 403 Tags
b17b6dbb8e57f159274deec9e458ab421bee09ff
Commit Graph

36804 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Kitware Robot b17b6dbb8e CMake Nightly Date Stamp 2017-08-08 00:01:06 -04:00
Brad King 3a0ef7ac1a Merge topic 'autogen-configs' 
5150c352 Autogen: Add release notes for per-config include dir
ccc98b5c Autogen: Update documentation for per-config include dir
a13716a5 Autogen: Enable per-config support
6d83757f Autogen: Generate rcc wrapper file on demand
74a1b8eb Autogen: Fix configuration suffix initialization
ddd6f0db Autogen: Add per-config suffix to moc_predefs.h
e2c9cf12 Autogen: Remove per-config suffix for mocs_compilations.cpp
3a4840e0 Autogen: Make test per-config include directory compatible

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1107
 2017-08-07 10:34:48 -04:00
Kitware Robot 1f20aff2a6 CMake Nightly Date Stamp 2017-08-07 00:01:05 -04:00
Kitware Robot 8d189ebd14 CMake Nightly Date Stamp 2017-08-06 00:01:04 -04:00
Sebastian Holtermann 5150c3527d Autogen: Add release notes for per-config include dir 2017-08-05 15:06:16 +02:00
Sebastian Holtermann ccc98b5cbe Autogen: Update documentation for per-config include dir 2017-08-05 15:01:28 +02:00
Sebastian Holtermann a13716a5dc Autogen: Enable per-config support 
Enables the AUTOGEN per-config include directories and wrapper sources
for multi configuration generators.

Closes #16460
 2017-08-05 14:37:03 +02:00
Sebastian Holtermann 6d83757f26 Autogen: Generate rcc wrapper file on demand 
For multi configuration generators remove per-config
qrc_FOO_$<CONFIG>.cpp source file support.
Instead use a single source file qrc_FOO.cpp which is a wrapper
that includes the actual rcc generated qrc_FOO_CONFIG.cpp file.

This way, after a repeated configuration change, only the wrapper file
qrc_FOO.cpp must be regenerated to include the appropriate
qrc_FOO_CONFIG.cpp file.
 2017-08-05 14:21:50 +02:00
Sebastian Holtermann 74a1b8ebde Autogen: Fix configuration suffix initialization 
The configuration suffix was used before it was initialized.
 2017-08-05 12:46:10 +02:00
Sebastian Holtermann ddd6f0db1e Autogen: Add per-config suffix to moc_predefs.h 
moc_predefs.h is generated using per-config -D definitions
and therefore must be configuration specific as well.
 2017-08-05 12:27:11 +02:00
Sebastian Holtermann e2c9cf12d1 Autogen: Remove per-config suffix for mocs_compilations.cpp 2017-08-05 12:08:14 +02:00
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 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