summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
| * | | | | | | | | | server: Fix crash on missing cache entriesLaurent Rineau2017-08-021-1/+3
| | |_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Test for nullptr before constructing std::string.
* | | | | | | | | | Merge topic 'UseSWIG-Java-enabled'Brad King2017-08-031-2/+4
|\ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / | |/| | | | | | / / | |_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | b4fbf677 UseSWIG: Fix when Java is enabled as a language Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1095
| * | | | | | | | UseSWIG: Fix when Java is enabled as a languageBrad King2017-08-021-2/+4
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | | | | | | CMake Nightly Date StampKitware Robot2017-08-031-1/+1
| | | | | | | |
* | | | | | | | Merge topic 'autogen-depends'Craig Scott2017-08-027-45/+128
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | | | Autogen: Add AUTOMOC test for target dependencies forwardingSebastian Holtermann2017-08-016-33/+95
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds an AUTOMOC test that tests if dependencies from add_dependencies() of an ORIGIN target are forwarded to the ORIGIN_autogen target. Also fixes the AUTOMOC test that tests if dependencies from target_link_libraries() of an ORIGIN target are forwarded to the ORIGIN_autogen target. The test now fails in the ORIGIN_autogen build if SimpleLib wasn't built before.
| * | | | | | | | Autogen: Forward target dependencies to *_autogen targetSebastian Holtermann2017-07-281-12/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Only the dependecies from target_link_libraries() of the origin target were forwarded to the _autogen target. This patch adds forwarding of the dependencies from add_dependencies() to the _autogen target. Closes #17094
* | | | | | | | | Merge topic 'FindLibXml2-compat'Brad King2017-08-021-0/+7
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d1a77565 FindLibXml2: Restore compatibility with projects setting LIBXML2_LIBRARIES Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1094
| * | | | | | | | | FindLibXml2: Restore compatibility with projects setting LIBXML2_LIBRARIESBrad King2017-08-021-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In commit a1b38865 (FindLibXml2: Switch to standard module variable names, 2017-07-11) the cache variable used to store the find_library result was renamed. This breaks projects that set the old variable name explicitly. Fix compatibility with such projects by using the old variable as a default if it is set and the new one is not.
* | | | | | | | | | Merge topic 'update-libarchive'Brad King2017-08-0265-2761/+4372
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | | | | | libarchive: Fix inclusion of zlib, bzlib, and lzma for build within CMakeBrad King2017-07-201-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update a new source file imported from libarchive upstream to include the headers for compression libraries using the CMake wrappers.
| * | | | | | | | | | Merge branch 'upstream-LibArchive' into update-libarchiveBrad King2017-07-2064-2760/+4371
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream-LibArchive: LibArchive 2017-07-09 (98a69539)
generated by cgit v0.12 at 2025-01-26 19:46:42 (GMT)