summaryrefslogtreecommitdiffstats
path: root/Modules
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'GNUG_define'Brad King2017-01-272-0/+15
|\ | | | | | | | | 24d73fa0 GNUC: also check __GNUG__ define when checking for g++
| * GNUC: also check __GNUG__ define when checking for g++Rolf Eike Beer2017-01-252-0/+15
| | | | | | | | | | | | | | At least the scratchbox compiler for the N900, which basically is a gcc 4.2, sets only __GNUG__ in C++ mode, but not __GNUC__. It does indeed set __GNUC_MINOR__ and __GNUC_PATCHLEVEL__. Extend the compiler detection code for GNU compilers in C++ mode to look at __GNUG__ in case __GNUC__ is absent.
* | Merge topic 'FindCUDA-select-flags-auto-msvc'Brad King2017-01-261-9/+11
|\ \ | | | | | | | | | | | | c1f3086d FindCUDA: Enable CUDA_SELECT_NVCC_ARCH_FLAGS Auto for MSVC
| * | FindCUDA: Enable CUDA_SELECT_NVCC_ARCH_FLAGS Auto for MSVCBjoern Thiel2017-01-251-9/+11
| | | | | | | | | | | | Fixes: #16525
* | | Merge topic 'pkg-config-recheck'Brad King2017-01-261-1/+4
|\ \ \ | | | | | | | | | | | | | | | | 796dea67 FindPkgConfig: Recheck pkg-config on parameter change.
| * | | FindPkgConfig: Recheck pkg-config on parameter change.Matthew Hanna2017-01-251-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently, once pkg_check_modules succeeds, it will never call _pkg_check_modules_internal again. That means that if the parameters to pkg_check_modules are changed, cmake will be called to reconfigure, but nothing will change. This change is to store the full string of arguments to pkg_check_modules and override the FOUND optimization so that the arguments are reevaluated when modified.
* | | | Merge topic 'FindGTK2_RunTwice'Brad King2017-01-261-42/+40
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | 4bc2c16b FindGTK2: Add unit test to check variables when run twice 9702b3ee FindGTK2: Fix GTK2_LIBRARIES and GTK2_TARGETS when called twice
| * | | | FindGTK2: Fix GTK2_LIBRARIES and GTK2_TARGETS when called twiceDaniele E. Domenichelli2017-01-251-42/+40
| | |/ / | |/| | | | | | | | | | Closes: #16582
* | | | Merge topic 'FindLua-versioned-lib'Brad King2017-01-261-7/+9
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | 2759e225 FindLua: try to find library according to version from header
| * | | FindLua: try to find library according to version from headerBrad King2017-01-241-7/+9
| | |/ | |/| | | | | | | | | | Patch-by: fft on gitlab.kitware.com Issue: #15756
* | | Merge topic 'intel-mpi-windows-fix'Brad King2017-01-251-5/+8
|\ \ \ | | | | | | | | | | | | | | | | | | | | e6eaf25c FindMPI: Strip quotes from include path and convert to CMake path format 39bf93c8 FindMPI: Add Intel MPI wrapper names on Windows
| * | | FindMPI: Strip quotes from include path and convert to CMake path formatChristian Pfeiffer2017-01-231-0/+2
| | | |
| * | | FindMPI: Add Intel MPI wrapper names on WindowsChristian Pfeiffer2017-01-231-5/+6
| |/ /
* | | Merge topic 'cpack-ifw-options'Brad King2017-01-251-19/+66
|\ \ \ | | | | | | | | | | | | | | | | e5089c56 CPackIFW: Add some options
| * | | CPackIFW: Add some optionsKonstantin Podsvirov2017-01-241-19/+66
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The cpack_ifw_configure_component_group command gained options: - DEPENDS. The cpack_ifw_configure_component and cpack_ifw_configure_component_group commands gained options: - REQUIRES_ADMIN_RIGHTS; - UPDATE_TEXT; - SORTING_PRIORITY; # New name for PRIORITY - DEPENDENCIES; # Alias for DEPENDS - AUTO_DEPEND_ON; - TRANSLATIONS. For both commands PRIORITY option now is depreceted. Please use SORTING_PRIORITY instead.
* | | Merge topic 'cuda_linker_preference'Brad King2017-01-251-1/+1
|\ \ \ | |_|/ |/| | | | | | | | df3353d1 CUDA: set linker preference between C and C++
| * | CUDA: set linker preference between C and C++Robert Maynard2017-01-241-1/+1
| |/
* | Merge topic 'cpack-stgz-minimal-test'Brad King2017-01-241-1/+4
|\ \ | | | | | | | | | | | | | | | 624709c8 CPack/STGZ: minimalistic packages test 1c93eb68 CPack/STGZ prefer pax for extraction
| * | CPack/STGZ prefer pax for extractionDomen Vrankar2017-01-221-1/+4
| | | | | | | | | | | | | | | | | | pax is part of POSIX while tar requires GNU extensions that are not part of some UNIX distros
* | | Merge topic 'android-include-api'Brad King2017-01-242-3/+11
|\ \ \ | | | | | | | | | | | | | | | | | | | | 1ee0ffab Android: Pass sysroot include directory explicitly 1806e011 Android: Fix c++_{static,shared} support include directory order
| * | | Android: Pass sysroot include directory explicitlyBrad King2017-01-201-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The NDK's `build/core/definitions.mk` file adds compiler flags: -isystem $$(call host-path,$$(SYSROOT_INC)/usr/include) This passes the system include directory explicitly even though it is implied by `--sysroot=`. The explicit flag places the directory earlier in the include path than the sysroot-default one would be. Teach CMake to add this include directory at the end of the standard include path for Android. Otherwise the toolchain's `include-fixed/` directory may replace system headers with "fixed" copies that are not from the same API version. Closes: #16536
| * | | Android: Fix c++_{static,shared} support include directory orderBrad King2017-01-201-3/+2
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The NDK's own build files: <ndk>/build/tools/build-cxx-stl.sh <ndk>/build/cmake/android.toolchain.cmake for the `c++_static` and `c++_shared` build types add the `<ndk>/sources/android/support/include` include directory between the two `<ndk>/sources/cxx-stl/llvm-libc++*` directories. Re-order our own include directory generation to match. Issue: #16536
* | | Merge topic 'qt4-lupdate-cmp0058'Brad King2017-01-241-1/+1
|\ \ \ | |/ / |/| | | | | | | | 1c2ac0b8 Qt4: Only change timestamp on generated .pro files if content changes
| * | Qt4: Only change timestamp on generated .pro files if content changesClinton Stimpson2017-01-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | In qt4_create_translation() use file(GENERATE ...) instead of file(WRITE ...). This also removes a possible CMP0058 warning because file(GENERATE) tells the Ninja generator about the files it provides. Fixes: #16518
* | | Merge topic 'add-dl-to-lua-static-linking'Brad King2017-01-201-0/+7
|\ \ \ | | | | | | | | | | | | | | | | adc04afe FindLua: Add dl library to Lua static library linking
| * | | FindLua: Add dl library to Lua static library linkingMichael Krasnyk2017-01-201-0/+7
| | |/ | |/| | | | | | | | | | If a Lua library is compiled from source as `liblua.a` its link dependency on `dl` must be satisfied explicitly.
* | | Merge topic 'ExternalProject-restore-case-insensitive-hash'Brad King2017-01-201-1/+1
|\ \ \ | | | | | | | | | | | | | | | | 0ed885f7 ExternalProject: Restore case-insensitive download hash check
| * | | ExternalProject: Restore case-insensitive download hash checkBrad King2017-01-171-1/+1
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactoring in commit v3.6.0-rc1~47^2 (ExternalProject: Re-implement download logic as a dedicated script, 2016-05-19) accidentally made the download hash check case-sensitive. The hash comparison is done in hex strings, so restore case-insensitive comparison since the case of the hex digits does not matter. Fixes: #16568
* | | Merge topic 'cpack-ifw-new-installer-options'Brad King2017-01-201-0/+28
|\ \ \ | |/ / |/| | | | | | | | 3fc4a2b7 QtIFW: Added new options to QtIFW cpack generator for modifying wizard style
| * | QtIFW: Added new options to QtIFW cpack generator for modifying wizard styleAlexander Voitenko2017-01-171-0/+28
| | |
* | | Merge topic 'FindICU-include-dirs'Brad King2017-01-171-0/+1
|\ \ \ | | | | | | | | | | | | | | | | cdf7e5d8 FindICU: Add 'include' to the path suffixes
| * | | FindICU: Add 'include' to the path suffixesFlorent Castelli2017-01-161-0/+1
| |/ / | | | | | | | | | Without this FindICU doesn't recognise the installation within homebrew.
* | | FindHDF5: use the target rather than the pathBen Boeckel2017-01-161-4/+4
| |/ |/| | | | | | | On Windows, the `LOCATION` property gets the path to the `.dll` rather than the `.lib` which is unsuitable for linking.
* | Merge topic 'csharp_simple'Brad King2017-01-161-4/+0
|\ \ | | | | | | | | | | | | | | | | | | 397b8546 VS: added documentation for C# support a7dd8e66 VS: added support for C# (for Visual Studio 2010, 2012, 2013, 2015) 6fda6005 VS: renamed target property VS_USER_PROPS_CXX to VS_USER_PROPS
| * | VS: added support for C# (for Visual Studio 2010, 2012, 2013, 2015)Michael Stürmer2017-01-131-4/+0
| | |
* | | Merge topic 'cuda_propagate_flags_when_dlink_on_executables'Brad King2017-01-163-2/+4
|\ \ \ | | | | | | | | | | | | | | | | | | | | 8d1f9e5b CUDA: Now pass correct FLAGS when device link cuda executables. dc5051f1 CUDA: Test that CUDA flags are used when device linking executables.
| * | | CUDA: Now pass correct FLAGS when device link cuda executables.Robert Maynard2017-01-123-2/+4
| |/ / | | | | | | | | | | | | | | | | | | | | | Previously we had a two issues when building cuda executables that required separable compilation. The first was that we didn't propagate FLAGS causing any -arch / -gencode flags to be dropped, and secondly generators such as ninja would use the CXX language flags instead of CUDA when the executable was mixed language.
* | | Merge topic 'clang-3.1-3.3-cpp11'Brad King2017-01-162-5/+4
|\ \ \ | |_|/ |/| | | | | | | | 9fe399e3 Features: activate C++11 support for Clang 3.1+
| * | Features: activate C++11 support for Clang 3.1+Giel van Schijndel2017-01-122-5/+4
| |/
* | CheckFunctionExists: Document suggestion to use CheckSymbolExists instead.Stephen Sorley2017-01-121-9/+21
|/ | | | | CheckFunctionExists has some severe limitations that are overcome by CheckSymbolExists. Document them and suggest the alternative.
* Merge topic 'cuda-windows'Brad King2017-01-1212-24/+139
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | f9a810f7 CUDA: Enable CudaOnly.SeparateCompilation test runtime calls 5599d858 CUDA: Port test cases to Windows with MSVC host compiler 11551702 CUDA: Populate NVIDIA compiler information on Windows 5365421e CUDA: Detect implicit link information on Windows 522b913f CUDA: Find MSVC binutils on Windows 02582b91 CUDA: Populate compiler PDB placeholder during device linking d470cb70 CUDA: Use `.obj` object file extension on Windows a2e80cb0 CUDA: Detect MSVC architecture id 65c1e012 CUDA: Detect use of MSVC host compiler 945dd207 CUDA: Allow platform files to set device linking rules 95420cea CMakeParseImplicitLinkInfo: Add support for MSVC invoked by CUDA nvcc
| * CUDA: Populate NVIDIA compiler information on WindowsBrad King2017-01-122-13/+59
| | | | | | | | | | | | | | Port Windows-specific compilation and linking rules over from the `Platform/Windows-MSVC` module and adapt it for NVIDIA CUDA. On Windows nvcc and its host compiler (MSVC) do not understand or use options like `-fPIC` or `-std=`, so condition those out.
| * CUDA: Detect implicit link information on WindowsBrad King2017-01-123-1/+15
| | | | | | | | | | The `nvcc -v` output on Windows uses response files, so load the one we need to extract the full link line.
| * CUDA: Find MSVC binutils on WindowsBrad King2017-01-122-3/+8
| | | | | | | | | | On Windows the host link launcher is just `link.exe`. Find and use that instead of trying to extract the launcher from the `nvcc -v` output.
| * CUDA: Use `.obj` object file extension on WindowsBrad King2017-01-121-1/+5
| |
| * CUDA: Detect MSVC architecture idBrad King2017-01-123-0/+7
| |
| * CUDA: Detect use of MSVC host compilerBrad King2017-01-123-1/+22
| | | | | | | | Report it in `CMAKE_CUDA_SIMULATE_{ID,VERSION}`.
| * CUDA: Allow platform files to set device linking rulesBrad King2017-01-121-5/+8
| | | | | | | | | | Condition the default settings on the rule variables not already being set.
| * CMakeParseImplicitLinkInfo: Add support for MSVC invoked by CUDA nvccBrad King2017-01-121-0/+15
| |
* | Merge topic 'InstallRequiredSystemLibraries-UCRT-configs'Brad King2017-01-121-8/+14
|\ \ | | | | | | | | | | | | e0ed1de4 InstallRequiredSystemLibraries: Distinguish UCRT install configurations
generated by cgit v0.12 at 2025-01-25 04:51:17 (GMT)