summaryrefslogtreecommitdiffstats
path: root/Modules
Commit message (Collapse)AuthorAgeFilesLines
* 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 '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 '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 '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>
* | | | | 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 'FindJava-fix-1.6-registry'Brad King2017-08-021-1/+1
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5479074b FindJava: fix hint for windows jre 1.6 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1079
| * | | | | FindJava: fix hint for windows jre 1.6Rechi Rechi2017-08-021-1/+1
| | |/ / / | |/| | | | | | | | | | | | | | | | | | Fix typo in commit v3.8.0-rc1~112^2 (FindJava: add hints for jre, 2017-01-11).
* | | | | Merge topic 'FindMatlab/CUSTOM_TEST_COMMAND-documentation-fix'Craig Scott2017-07-291-2/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5a9c4aeb FindMatlab: CUSTOM_TEST_COMMAND documentation fix Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1086
| * | | | | FindMatlab: CUSTOM_TEST_COMMAND documentation fixRaffi Enficiaud2017-07-271-2/+2
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | Documentation states CUSTOM_MATLAB_COMMAND, while code uses CUSTOM_TEST_COMMAND. Addresses issue #17107
* | | | | Merge topic 'FindJava_earlyAccessDebian'Craig Scott2017-07-281-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e42fa012 Allow early access version trailing string to be mixed case Acked-by: Kitware Robot <kwrobot@kitware.com> Tested-by: Felix Geyer <debfx@fobos.de> Merge-request: !1080
| * | | | | Allow early access version trailing string to be mixed caseCraig Scott2017-07-251-1/+1
| | |/ / / | |/| | | | | | | | | | | | | | | | | | The original regex was expecting to match strings like "ea", but it has been reported that other strings like "Debian" are also possible.
* | | | | Merge topic 'FindBoost'Craig Scott2017-07-271-0/+2
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | eddbd62d FindBoost: pop policy stack before returning Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1078
| * | | | FindBoost: pop policy stack before returningCristian Adam2017-07-261-0/+2
| |/ / / | | | | | | | | | | | | | | | | CMake would give a fatal error if the policy stack was cleaned up upon exiting the module.
| * | | Merge branch 'ninja_cuda_export_compile_commands_support' into release-3.9Brad King2017-07-131-1/+3
| |\ \ \
* | \ \ \ Merge topic 'CheckSymbolExists-rename-impl'Craig Scott2017-07-242-4/+4
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4637cc8f CheckSymbolExists: Rename implementation macro Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1067
| * | | | | CheckSymbolExists: Rename implementation macroCristian Adam2017-07-202-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently the implementation macro for `check_symbol_exists` is `_check_symbol_exists`, which impedes CMake users from overriding the `check_symbol_exists` macro themselves.
* | | | | | Merge topic 'cpack-stgz-help'Brad King2017-07-211-0/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 29a5cf7c CPack: Add missing options to installer shell script help Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1068
| * | | | | | CPack: Add missing options to installer shell script helpFrancois Budin2017-07-201-0/+2
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | `--version` and `--skip-license` were not in the list of available options when running script with `--help` option.
* | | | | | Merge topic 'docsExternalProject'Brad King2017-07-211-374/+821
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8842a027 ExternalProject: Improve documentation Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1037
| * | | | | | ExternalProject: Improve documentationCraig Scott2017-07-171-374/+821
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Added clearer structure by grouping the options into logical sections. - Expanded the details for many of the options. - Added Examples section to show how to use the various commands. - Specifically highlighted that the contents of SOURCE_DIR may be lost if a download method is also provided. - Updated argument-matching regex to be more robust and account for the varying leading spaces before keywords in the docs. - Updated tests to account for slightly changed error messages.
* | | | | | | Merge topic 'vs-lang-std'Brad King2017-07-202-4/+28
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 131c721f MSVC: Add flags for C++ language standards Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1063
| * | | | | | MSVC: Add flags for C++ language standardsBrad King2017-07-172-4/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Visual Studio 2015 Update 3 introduced the notion of language standard levels to MSVC. The language standard level is defined in `_MSVC_LANG` instead of `__cplusplus`. It also added support for the `-std:c++14` and `-std:c++latest` flags, although the compiler defaults to its C++14 mode anyway. Visual Studio 2017 Update 3 will introduce support for the `-std:c++17` flag. Fixes: #16482
* | | | | | | Merge topic 'GHS_int_detection'Brad King2017-07-181-1/+1
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8eb1cb3f GHS: Correct the regex for the intXXXX directory detection. Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1062
| * | | | | | GHS: Correct the regex for the intXXXX directory detection.Roman Wüger2017-07-171-1/+1
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | The int directory does not only need to contain digits. E.g. C:\GHS\int409a is a valid Green Hills installation
* | | | | | Merge topic 'FindLibXml2-standard-vars'Brad King2017-07-171-12/+34
|\ \ \ \ \ \ | |/ / / / / |/| | | | / | | |_|_|/ | |/| | | | | | | | | | | | | a1b38865 FindLibXml2: Switch to standard module variable names Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1043
| * | | | FindLibXml2: Switch to standard module variable namesVadim Zhukov2017-07-141-12/+34
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * LIBXML2_INCLUDE_DIR talks about libxml2 itself; * LIBXML2_INCLUDE_DIRS lists also include directories coming from libxml2's dependencies and is what libxml2 users should use; * LIBXML2_LIBRARY talks about libxml2 itself; * LIBXML2_LIBRARIES is what libxml2 users should link to. This commit doesn't break existing users of FindLibXml2.cmake, but provides the way for correct behaviour in future. In particular, on OpenBSD LIBXML2_INCLUDE_DIR resolves to /usr/local/include/libxml2, while libiconv (an libxml2 dependency) puts iconv.h in /usr/local/include, which is not picked up automatically.
* | | | Merge topic 'cmp0054-asm-warning'Brad King2017-07-141-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 336c4fc6 CMakeDetermineASMCompiler: fix a CMP0054 warning Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1057
| * | | | CMakeDetermineASMCompiler: fix a CMP0054 warningBen Boeckel2017-07-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was introduced in commit d8e6cd9e (IAR: Improve support for IAR ARM Compiler, 2017-06-15) from !991. Fixes #17062.
* | | | | Merge topic 'ninja_cuda_export_compile_commands_support'Brad King2017-07-141-1/+3
|\ \ \ \ \ | | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | 712af07e CUDA: CMAKE_EXPORT_COMPILE_COMMANDS now works with CUDA and Ninja Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1055
| * | | | CUDA: CMAKE_EXPORT_COMPILE_COMMANDS now works with CUDA and NinjaRobert Maynard2017-07-131-1/+3
| | | | | | | | | | | | | | | | | | | | Fixes: #17061
* | | | | Merge topic 'CMakePushCheckState-fix-RESET'Brad King2017-07-141-1/+1
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | fda50a08 CMakePushCheckState: Fix cmake_push_check_state RESET argument Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1040
| * | | | CMakePushCheckState: Fix cmake_push_check_state RESET argumentBrad King2017-07-121-1/+1
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This option was added by commit v2.8.12~138^2 (Add cmake_reset_check_state() macro, 2013-07-28) but has never worked. Fix the implementation to refer to macro arguments properly (not as normal variables). Fixes: #17048
* | | | Merge topic 'android-system-include-last'Brad King2017-07-131-1/+0
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | 4bafa392 Android: Always add standard include directories last Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1052
| * | | Android: Always add standard include directories lastBrad King2017-07-131-1/+0
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The logic added in commit v3.6.0-rc1~30^2 (Add a variable to specify language-wide system include directories, 2016-05-24) to use `CMAKE_<LANG>_STANDARD_INCLUDE_DIRECTORIES` incorrectly filters them by `CMAKE_<LANG>_IMPLICIT_INCLUDE_DIRECTORIES`. Rather than recognizing this, commit v3.8.0-rc1~60^2 (Android: Pass sysroot include directory explicitly, 2017-01-20) worked around the problem by incorrectly removing `/usr/include` from `CMAKE_<LANG>_IMPLICIT_INCLUDE_DIRECTORIES` so it worked in `CMAKE_<LANG>_STANDARD_INCLUDE_DIRECTORIES`. By not filtering out `/usr/include` from user-specified include directories, we allow the code include_directories(${CMAKE_SYSROOT}/usr/include) to place the include directory too early on the command line. Fix support for standard include directories to not be filtered by implicit include directories, and do not remove `/usr/include` from the list of implicit include directories for Android builds. Add a test case to verify that an explicit `/usr/include` is ignored in favor of the standard directory at the end. Fixes: #17059
| * | Merge branch 'android-fix-c++_shared' into release-3.9Brad King2017-07-121-0/+1
| |\ \
* | \ \ Merge topic 'FindProtobuf-protoc-target'Brad King2017-07-131-4/+16
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c281acf8 FindProtobuf: add target for protoc Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1045
| * | | | FindProtobuf: add target for protocAndré Apitzsch2017-07-121-4/+16
| | | | |
* | | | | Merge topic 'labels-for-subprojects'Brad King2017-07-131-0/+3
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 376dc3eb Help: Add notes for topic 'labels_for_subprojects' a70d8e93 Add tests for new directory labels and labels-for-subprojects features 47b3a57c Display subproject timing summary d3859624 Add directory property 'LABELS' and CMAKE_DIRECTORY_LABELS variable d08ec4d2 Add CTEST_LABELS_FOR_SUBPROJECTS as a CTest module and script variable Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1004
| * | | | | Add CTEST_LABELS_FOR_SUBPROJECTS as a CTest module and script variableBetsy McPhail2017-07-101-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use this variable to specify a list of labels that will be reported to CDash as subprojects.
* | | | | | Merge topic 'android-fix-c++_shared'Brad King2017-07-121-0/+1
|\ \ \ \ \ \ | |_|/ / / / |/| | | / / | | |_|/ / | |/| | | | | | | | | | | | | e0fb3f31 Android: Link to android_support with c++_shared Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1048
generated by cgit v0.12 at 2025-01-31 01:10:41 (GMT)