summaryrefslogtreecommitdiffstats
path: root/Modules
Commit message (Collapse)AuthorAgeFilesLines
* FortranCInterface: Fix support for VS with Intel toolsetBrad King2017-02-012-2/+4
| | | | | | | | | | | | | | | When using a Visual Studio generator with an Intel toolset, such as -T "Intel C++ Compiler XE 14.0" the generated FortranCInterface mangling detection project may fail to build due to `devenv` not working with the `/project ALL_BUILD` option. This seems to be a bug in `devenv` or the Intel VS integration. Work around the problem by building with `/project FortranCInterface` instead. We only need to build this executable and its dependencies within the detection test project anyway. Fixes: #16519
* Merge topic 'CSharpVS2017'Brad King2017-01-311-4/+4
|\ | | | | | | | | 435cebaa VS: Fix CSharp compiler identification for VS 2017
| * VS: Fix CSharp compiler identification for VS 2017Gilles Khouzam2017-01-311-4/+4
| | | | | | | | | | | | The CSharp compiler for VS 2017 has moved from `MSBuildTools` to `RoslynTargets`. Account for both locations giving priority to the `MSBuildTools` location.
* | Merge topic 'FindBoost-cache-unset-on-change'Brad King2017-01-311-1/+1
|\ \ | | | | | | | | | | | | 97d61562 FindBoost: unset cache variables if the lib dir changes
| * | FindBoost: unset cache variables if the lib dir changesYves Frederix2017-01-301-1/+1
| |/ | | | | | | | | | | | | | | This fixes a regression introduced by commit v3.3.0-rc1~5^2~2 (FindBoost: Search for debug and release libraries separately, 2015-01-26). The `_Boost_CHANGE_LIBDIR` variable was split into `_Boost_CHANGE_LIBDIR_{DEBUG,RELEASE}` but one usage site was not updated.
* | Merge topic 'FeatureSummary_enhancement'Brad King2017-01-301-101/+229
|\ \ | |/ |/| | | | | | | | | | | | | | | | | | | 560574b0 FeatureSummary: Update release notes 3cfde818 FeatureSummary: Refactor to use global properties for package types f0165eb6 FeatureSummary: Allow lists of dependencies in ADD_FEATURE_INFO 9da7bf08 FeatureSummary: Add QUIET_ON_EMPTY option to feature_summary 4cf4aceb FeatureSummary: Add unit tests 614a97a5 FeatureSummary: Do not force OPTIONAL type in SET_PACKAGE_PROPERTIES 65a0bfd8 FeatureSummary: Add deprecation warnings to deprecated commands 4da3cae9 FeatureSummary: Clean printed output
| * FeatureSummary: Refactor to use global properties for package typesDaniele E. Domenichelli2017-01-261-70/+171
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These new global properties were added: * FeatureSummary_PKG_TYPES: Package types accepted by FeatureSummary (default REQUIRED RECOMMENDED OPTIONAL RUNTIME). * FeatureSummary_REQUIRED_PKG_TYPES: Package types that will cause FeatureSummary to abort when called with FATAL_ON_MISSING_REQUIRED_PACKAGES and a package in these categories is missing (default REQUIRED). * FeatureSummary_DEFAULT_PKG_TYPE: Default package type assigned when not explicitly assigned by the user (default OPTIONAL). This allows to add and remove new package types that can be printed selectively using the "WHAT" argument.
| * FeatureSummary: Allow lists of dependencies in ADD_FEATURE_INFODaniele E. Domenichelli2017-01-261-2/+12
| |
| * FeatureSummary: Add QUIET_ON_EMPTY option to feature_summaryDaniele E. Domenichelli2017-01-261-13/+23
| | | | | | | | | | This option suppresses the output when the list of packages that belong to the selected category is empty.
| * FeatureSummary: Do not force OPTIONAL type in SET_PACKAGE_PROPERTIESDaniele E. Domenichelli2017-01-261-16/+14
| | | | | | | | | | | | | | | | | | | | | | The OPTIONAL type is used anyway as default when the type is not set Since RUNTIME < OPTIONAL, forcing it here forces the user to set "RUNTIME" at the first SET_PACKAGE_PROPERTIES, otherwise it is impossible to set it later. Without this it is impossible, for example, to add package information (URL and DESCRIPTION) in the FindPackage file, but allow the package to be RUNTIME.
| * FeatureSummary: Add deprecation warnings to deprecated commandsDaniele E. Domenichelli2017-01-261-0/+6
| |
| * FeatureSummary: Clean printed outputDaniele E. Domenichelli2017-01-261-6/+9
| | | | | | | | | | | | | | * Remove space before commas * Do not add an empty line before the first type of packages Also fix a typo in unit test.
* | 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+