summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* CMake Nightly Date StampKitware Robot2017-08-081-1/+1
|
* Merge topic 'autogen-configs'Brad King2017-08-078-73/+91
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * Autogen: Add release notes for per-config include dirSebastian Holtermann2017-08-051-0/+8
| |
| * Autogen: Update documentation for per-config include dirSebastian Holtermann2017-08-053-0/+12
| |
| * Autogen: Enable per-config supportSebastian Holtermann2017-08-052-12/+3
| | | | | | | | | | | | | | Enables the AUTOGEN per-config include directories and wrapper sources for multi configuration generators. Closes #16460
| * Autogen: Generate rcc wrapper file on demandSebastian Holtermann2017-08-052-20/+45
| | | | | | | | | | | | | | | | | | | | | | 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.
| * Autogen: Fix configuration suffix initializationSebastian Holtermann2017-08-052-9/+7
| | | | | | | | The configuration suffix was used before it was initialized.
| * Autogen: Add per-config suffix to moc_predefs.hSebastian Holtermann2017-08-051-1/+3
| | | | | | | | | | moc_predefs.h is generated using per-config -D definitions and therefore must be configuration specific as well.
| * Autogen: Remove per-config suffix for mocs_compilations.cppSebastian Holtermann2017-08-052-29/+9
| |
| * Autogen: Make test per-config include directory compatibleSebastian Holtermann2017-08-051-2/+4
| |
* | CMake Nightly Date StampKitware Robot2017-08-071-1/+1
| |
* | CMake Nightly Date StampKitware Robot2017-08-061-1/+1
|/
* CMake Nightly Date StampKitware Robot2017-08-051-1/+1
|
* Merge branch 'release-3.9'Brad King2017-08-040-0/+0
|\
| * Merge branch 'add-package_root-to-find_package' into release-3.9Brad King2017-08-0314-461/+940
| |\ | | | | | | | | | Merge-request: !1082
| * \ Merge branch 'android-plain-sysroot' into release-3.9Brad King2017-08-031-3/+9
| |\ \ | | | | | | | | | | | | Merge-request: !1101
| * \ \ Merge branch 'vs-VCTargetsPath-force-config' into release-3.9Brad King2017-08-031-0/+1
| |\ \ \ | | | | | | | | | | | | | | | Merge-request: !1100
| * \ \ \ Merge branch 'doc-release-notes-orphan' into release-3.9Brad King2017-08-031-0/+2
| |\ \ \ \ | | | | | | | | | | | | | | | | | | Merge-request: !1077
* | \ \ \ \ Merge topic 'FindCygwin-64-bit'Brad King2017-08-041-4/+6
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0184531a FindCygwin: Look for Cygwin in C:\Cygwin64. Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1091
| * | | | | | FindCygwin: Look for Cygwin in C:\Cygwin64.Gerald Combs2017-08-041-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Add "C:\Cygwin64" to the list of Cygwin search paths.
* | | | | | | Merge topic 'genex-error-grammar'Brad King2017-08-048-15/+15
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e49c9eec cmGeneratorExpressionNode: add some missing commas Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1102
| * | | | | | | cmGeneratorExpressionNode: add some missing commasBen Boeckel2017-08-038-15/+15
| | | | | | | |
* | | | | | | | Merge topic 'file_WRITE_docs'Brad King2017-08-041-2/+5
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d7472bbf file: Clarify directory creation behavior when using WRITE Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1088
| * | | | | | | | file: Clarify directory creation behavior when using WRITERobert Dailey2017-08-031-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | | | | | | | Merge topic 'doc-file-GLOB-sorted'Brad King2017-08-041-3/+1
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 75ca5f04 Help: Document that file(GLOB) result is sorted Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1098
| * | | | | | | | | Help: Document that file(GLOB) result is sortedRuslan Baratov2017-08-031-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | | | | | | Merge topic 'set_IAR_excetion_option'Brad King2017-08-042-0/+5
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 168b42d2 IAR: Enable extensions by default Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1081
| * | | | | | | | | | IAR: Enable extensions by defaultNorbert Lange2017-08-032-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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).
* | | | | | | | | | | Merge topic 'FindHDF5-importedconf-fix'Brad King2017-08-041-13/+64
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | | | | | | FindHDF5: fixes for HL when using an imported configKris Thielemans2017-08-031-3/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - some variables did not have the appropriate HL infix - some logic was not yet implemented for HL
| * | | | | | | | | | | FindHDF5: unset some variablesKris Thielemans2017-08-031-12/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | prefixed some local variables with _hdf5 and unset them at the end (still more of these to do)
| * | | | | | | | | | | FindHDF5: for a static imported config, use CONFIG-specific libraryKris Thielemans2017-08-031-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | first check the LOCATION_<CONFIG> propertiy to find the library, then LOCATION
| * | | | | | | | | | | FindHDF5: fix hdf5-config case with more than one configurationKris Thielemans2017-08-031-3/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | | | | | | Merge topic 'doc-release-notes-orphan'Brad King2017-08-041-0/+2
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9e225766 Help: Silence warning about document not included in toctree Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1077
| * | | | | | | | | | | Help: Silence warning about document not included in toctreeBjörn Esser2017-08-031-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When not using the html or text builders, `Help/index.rst` does not include `Help/release/index.rst` in the toctree. Silence the warning.
* | | | | | | | | | | | Merge topic 'android-plain-sysroot'Brad King2017-08-041-3/+9
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 68d67c82 Android: Fix support for CMAKE_SYSROOT without CMAKE_SYSROOT_COMPILE Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1101
| * | | | | | | | | | | Android: Fix support for CMAKE_SYSROOT without CMAKE_SYSROOT_COMPILEBrad King2017-08-031-3/+9
| | |_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | | | | | Merge topic 'vs-VCTargetsPath-force-config'Brad King2017-08-041-0/+1
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fe3b481b VS: Fix VCTargetsPath detection Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1100
| * | | | | | | | | | VS: Fix VCTargetsPath detectionBrad King2017-08-031-0/+1
| |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | | | | Merge topic 'add-package_root-to-find_package'Brad King2017-08-0414-461/+940
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | | | | find_package: Split PACKAGE_ROOT tests to work with smaller regexChuck Atkins2017-08-027-846/+872
| | | | | | | | | |
| * | | | | | | | | find_package: Fix PACKAGE_ROOT test to check find_pacakge(CONFIG) mode.Chuck Atkins2017-07-287-99/+531
| | | | | | | | | |
| * | | | | | | | | find_package: Add missing PACKAGE_ROOT_PATH search path implementation.Chuck Atkins2017-07-282-0/+21
| |/ / / / / / / /
* | | | | | | | | CMake Nightly Date StampKitware Robot2017-08-041-1/+1
| |_|_|_|_|/ / / |/| | | | | | |
* | | | | | | | Merge topic 'doc-buildsystem-fix'Brad King2017-08-031-1/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cc78ff72 Help: Fix example in cmake-buildsystem(7) manual Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1097
| * | | | | | | | Help: Fix example in cmake-buildsystem(7) manualSebastian Nagel2017-08-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In the example code `serialization` is a PRIVATE dependency of `archiveExtras` and not of `archive`. Fix the corresponding prose.
* | | | | | | | | Merge branch 'release-3.9'Brad King2017-08-030-0/+0
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ | |/| | | | | | |
| * | | | | | | | Merge branch 'server-fix-crash' into release-3.9Brad King2017-08-021-1/+3
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !1096
| * \ \ \ \ \ \ \ \ Merge branch 'UseSWIG-Java-enabled' into release-3.9Brad King2017-08-021-2/+4
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !1095
* | \ \ \ \ \ \ \ \ \ Merge topic 'server-fix-crash'Brad King2017-08-031-1/+3
|\ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 70272f3c server: Fix crash on missing cache entries Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1096
generated by cgit v0.12 at 2025-01-03 22:32:52 (GMT)