summaryrefslogtreecommitdiffstats
path: root/Modules
Commit message (Collapse)AuthorAgeFilesLines
* 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
| * | | | Android: Link to android_support with c++_sharedBrad King2017-07-121-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | The NDK has done this in `build/core/definitions.mk` since r13 (r12 and below do so only for c++_static).
* | | | | Merge topic 'FindMFC-try-static'Brad King2017-07-111-0/+11
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6b2bf575 FindMFC: Check for static MFC variant Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1034
| * | | | | FindMFC: Check for static MFC variantRich Chiodo2017-07-061-0/+11
| | |/ / / | |/| | | | | | | | | | | | | | | | | | Some CMake applications can set /MT without setting CMAKE_MFC_FLAG. This change lets FindMFC work in those situations.
* | | | | Merge topic 'FindPkgConfig-rerun'Brad King2017-07-111-1/+3
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3cf267cf FindPkgConfig: do not always rerun pkg_check_modules() with 2 arguments Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1036
| * | | | | FindPkgConfig: do not always rerun pkg_check_modules() with 2 argumentsRolf Eike Beer2017-07-101-1/+3
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit v3.8.0-rc1~47^2 (FindPkgConfig: Recheck pkg-config on parameter change, 2017-01-17) calling `pkg_check_modules` always re-runs. The problem is that if there are only 2 arguments passed to `pkg_check_modules```, then `_module0` will be set and `ARGN` will be empty. When this is written to cache it will be stored as just the value of `_module0` without any semicolon, so on the next run this doesn't match the expected value and the search is rerun. Revise the logic to handle the case of empty `ARGN` separately. Fixes: #17003
* | | | | Merge topic 'FindHDF5-windows'Brad King2017-07-111-15/+27
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6848ff4c FindHDF5: Define H5_BUILT_AS_DYNAMIC_LIB when using Windows DLLs 6f131f49 FindHDF5: Add support for HDF5_USE_STATIC_LIBRARIES on Windows Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1023
| * | | | FindHDF5: Define H5_BUILT_AS_DYNAMIC_LIB when using Windows DLLsKris Thielemans2017-07-071-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When searching for shared libraries on Windows, add H5_BUILT_AS_DYNAMIC_LIB to HDF5_DEFINITIONS so that the header file knows how to dllimport the symbols.
| * | | | FindHDF5: Add support for HDF5_USE_STATIC_LIBRARIES on WindowsKris Thielemans2017-07-071-15/+23
| |/ / / | | | | | | | | | | | | Also add the `_D` suffix for debug libraries.
* | | | Merge topic 'iar_improved'Brad King2017-07-0716-89/+295
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d8e6cd9e IAR: Improve support for IAR ARM Compiler 0b1a2876 Add a CMAKE_<LANG>_COMPILER_ARCHITECTURE_ID variable fea7d69d Store CMAKE_ASM_COMPILER_VERSION persistently d2a8b5ce CMakeDetermineASMCompiler: Fix small copy-paste mistake a2112257 Add infrastructure to use language extensions without any standard 8cd28bb0 cmLocalGenerator: Switch order of <LANG>_{EXTENSIONS,STANDARD} check 0fc2d78e cmLocalGenerator: Simplify logic for language standard or extension flag Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !991
| * | | | IAR: Improve support for IAR ARM CompilerNorbert Lange2017-06-2910-75/+228
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make the implementation for this compiler more complete. IAR has multiple C++ modes, historically they were reduced c++ versions for embedded that gradually improved to the full standard (which can be reduced again by e.g. disabling rtti and exceptions). The new implementation picks the best available, but the c++ mode can also be overridden by defining `CMAKE_IAR_CXX_FLAG`. Add C/C++ standard flags so that all modes up to and including the last supported standard are defined. Fixes: #16826
| * | | | Add a CMAKE_<LANG>_COMPILER_ARCHITECTURE_ID variableNorbert Lange2017-06-299-0/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Compilers such as MSVC and IAR may have variants that target different architectures. We have been using a `MSVC_<LANG>_ARCHITECTURE_ID` variable to hold this information for MSVC. Add an alternative with a more general name (later we can port MSVC to it too). This additional information may be needed to generate proper invocations of the compiler based on its architecture variant.
| * | | | Store CMAKE_ASM_COMPILER_VERSION persistentlyNorbert Lange2017-06-292-13/+31
| | | | | | | | | | | | | | | | | | | | We already do this for other languages like C and CXX.
| * | | | CMakeDetermineASMCompiler: Fix small copy-paste mistakeNorbert Lange2017-06-291-1/+1
| | | | | | | | | | | | | | | | | | | | GNU is not a vendor of IAR.
* | | | | Merge topic 'FindDoxygen-create-output-dir'Brad King2017-07-071-3/+11
|\ \ \ \ \ | |_|/ / / |/| | | / | | |_|/ | |/| | | | | | | | | | | | | | 796b8fcb FindDoxygen: Create DOXYGEN_OUTPUT_DIRECTORY if it doesn't exist Acked-by: Kitware Robot <kwrobot@kitware.com> Reviewed-by: Craig Scott <craig.scott@crascit.com> Merge-request: !1019
| * | | FindDoxygen: Create DOXYGEN_OUTPUT_DIRECTORY if it doesn't existRobert Dailey2017-07-061-3/+11
| | | | | | | | | | | | | | | | | | | | If the doxygen output directory does not exist, create it prior to running the doxygen commands.
* | | | Merge topic 'FindDoxygen-project-in-subdir'Brad King2017-06-301-5/+5
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | 97a9a356 FindDoxygen: Use a stable reference to the location of global resources Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1014
| * | | FindDoxygen: Use a stable reference to the location of global resourcesRobert Dailey2017-06-291-5/+5
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | FindDoxygen generates some files based on the version of Doxygen whose content will not vary across a project and are therefore a global resource that can be shared by all calls to `find_package(Doxygen)` and to `doxygen_add_docs`. We currently use `${PROJECT_BINARY_DIR}` to reference their location, but this is not stable because `project()` calls in a subdirectory can change it. Use `${CMAKE_BINARY_DIR}` instead. Reviewed-by: Craig Scott <craig.scott@crascit.com> Fixes: #17022
| * | Merge branch 'FindDoxygen-internal-var' into release-3.9Brad King2017-06-271-6/+6
| |\ \
| * \ \ Merge branch 'GetPrerequisites-ucrt-no-warn' into release-3.9Brad King2017-06-261-1/+1
| |\ \ \
* | \ \ \ Merge topic '16961-xctest-scheme'Brad King2017-06-291-2/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fe34a5c8 Xcode: Add XCTest support to schema generator 690cf2c1 Xcode: Prepare schema generator for XCTest ff3498e7 XCTest: Speed up test by only enabling C language 610d2fce XCTest: Use bundle specific generator expressions Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1013
| * | | | | XCTest: Use bundle specific generator expressionsGregor Jasny2017-06-281-2/+2
| | | | | |
* | | | | | Merge topic 'deb-on-windows'Brad King2017-06-291-4/+10
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | 52991413 CPackDeb: Enable the DEB generator on Windows Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !979
| * | | | | CPackDeb: Enable the DEB generator on WindowsNils Gladitz2017-06-281-4/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | While some features require external Unix tools the generator is mostly portable. By enabling it on Windows it can be used for cross platform packaging.
* | | | | | Merge topic 'clang-cl-no-std'Brad King2017-06-282-29/+61
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c67bb5ba Clang: Do not add '-std=' options when simulating MSVC Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !982
| * | | | | | Clang: Do not add '-std=' options when simulating MSVCRuben Van Boxem2017-06-272-29/+61
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The `cl.exe` style command line does not accept the `-std=` options. Instead behave like MSVC where we don't define standard levels. Fixes: #16266
* | | | | | Merge topic 'docs_CheckXXXSourceYYY'Brad King2017-06-285-129/+298
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 63fc3bff Check*Source{Compiles,Runs}: Rewrite docs for these modules Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1005
| * | | | | | Check*Source{Compiles,Runs}: Rewrite docs for these modulesCraig Scott2017-06-245-129/+298
| | |_|_|_|/ | |/| | | |
* | | | | | Merge topic 'FindDoxygen-internal-var'Brad King2017-06-271-6/+6
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | d194bd91 FindDoxygen: Add private prefix to internal variables Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1012
| * | | | | FindDoxygen: Add private prefix to internal variablesBrad King2017-06-271-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit v3.9.0-rc1~55^2 (Improve Doxygen support, 2017-04-10) we accidentally leave a non-prefixed internal `result` variable set. This may interfere with project code. Add a prefix to avoid this.
* | | | | | Merge topic 'FindCUDA-no-empty-genex'Brad King2017-06-271-0/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a3e442bb FindCUDA: Fix CUDA_NVCC_FLAGS_<CONFIG> for separable compilation Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1008
| * | | | | | FindCUDA: Fix CUDA_NVCC_FLAGS_<CONFIG> for separable compilationRobert Maynard2017-06-261-0/+2
| | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit v3.0.0-rc6~3^2 (FindCUDA: Use CUDA_NVCC_FLAGS* for separable compilation, 2014-05-18), using the feature for one configuration results in empty-string ("") arguments on the command line for other configurations. This is because the generator expression for a non-matching configuration evaluates to an empty string but does not remove the argument. Use `COMMAND_EXPAND_LISTS` to remove the empty arguments from the custom command after genex evaluation. Fixes: #16411
* | | | | | FindCUDA: Use find_program if find_host_program is not availableMaxime Roussin-Bélanger2017-06-261-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CMake does not define the `find_host_program` command we've been using in the cross-compiling code path. It was provided by a widely used Android toolchain file. For compatibility, continue to use `find_host_program` if available, but otherwise use just `find_program`. Fixes: #16509
* | | | | | Merge topic 'toolchain-binutils-advanced'Brad King2017-06-262-0/+4
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | 04b2fc08 GCC,Clang: Mark CMAKE_<LANG>_COMPILER_{AR,RANLIB} as advanced Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1001
| * | | | | GCC,Clang: Mark CMAKE_<LANG>_COMPILER_{AR,RANLIB} as advancedBrad King2017-06-222-0/+4
| | | | | |
generated by cgit v0.12 at 2024-10-20 00:00:09 (GMT)