summaryrefslogtreecommitdiffstats
path: root/Modules
Commit message (Collapse)AuthorAgeFilesLines
* FindMPI: Remove leading spaces from flagsChristian Pfeiffer2017-02-021-0/+2
|
* FindMPI: Reset MPI_INCLUDE_PATH_WORK before useChristian Pfeiffer2017-02-011-0/+2
|
* 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
| * | InstallRequiredSystemLibraries: Distinguish UCRT install configurationsBjoern Thiel2017-01-111-8/+14
| | | | | | | | | | | | | | | | | | | | | | | | Teach the `CMAKE_INSTALL_UCRT_LIBRARIES` feature to honor the `CMAKE_INSTALL_DEBUG_LIBRARIES_ONLY` and `CMAKE_INSTALL_DEBUG_LIBRARIES` settings. Closes: #16542
* | | Merge topic 'get_prerequisites_delayload'Brad King2017-01-121-0/+14
|\ \ \ | | | | | | | | | | | | | | | | a7c5d5fb GetPrerequisites: Exclude delay load dependencies on Windows
| * | | GetPrerequisites: Exclude delay load dependencies on WindowsPascal Thomet2017-01-111-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With some Windows toolchains we use `objdump` which does not mention delay load dependencies in its output. Therefore, to get consistent behavior we should always ignore them. Use the `dumpbin` message "Image has the following delay load dependencies" that precedes the delay load dependencies to recognize and skip them. Fortunately, this message is not translated to the current locale (at least on "Windows 7 French", "Windows 10 French" and "Windows Server 2008 R2 French"). Fixes: #16241
* | | | Merge topic 'fix_get_prerequisites'Brad King2017-01-121-0/+2
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | 17a0703d GetPrerequisites: Do not fail on files we cannot find
| * | | GetPrerequisites: Do not fail on files we cannot findMartin Koegler2017-01-111-0/+2
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Historically we have always warned and skipped missing files. Since commit v3.4.0-rc1~264^2~1 (GetPrerequisites: Add error checks for execute_process() calls, 2015-07-29) we fail instead, but this was not an intentional part of that change. Restore the warn-only behavior so that missing system libraries (e.g. during cross-compiling) do not cause failure. Closes: #16523
* | | Merge topic 'FindJava-jre-hints'Brad King2017-01-121-0/+8
|\ \ \ | | | | | | | | | | | | | | | | eb728d26 FindJava: add hints for jre
| * | | FindJava: add hints for jreRechi Rechi2017-01-111-0/+8
| |/ /
* | | Merge topic 'dont-include-CMakeParseArguments'Brad King2017-01-1219-39/+0
|\ \ \ | | | | | | | | | | | | | | | | d6877e6c Don't include CMakeParseArguments
| * | | Don't include CMakeParseArgumentsDaniel Pfeifer2017-01-1119-39/+0
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The cmake_parse_arguments command is builtin with version 3.5. The CMakeParseArguments module is empty and exists for backwards compatibility with CMake 3.4 and lower. Remove the includes of CMakeParseArguments from CMake's modules. The modules are always used with the current version of CMake. Leave the includes in the tests, as the tests may be run with an older version of CMake.
* | | Merge topic 'add-cpack-ifw-configure-file'Brad King2017-01-121-0/+65
|\ \ \ | | | | | | | | | | | | | | | | 6310f7c3 Add cpack_ifw_configure_file command
| * | | Add cpack_ifw_configure_file commandKonstantin Podsvirov2017-01-111-0/+65
| |/ /
* | | Merge topic 'UseSWIG-implicit-depends'Brad King2017-01-111-0/+1
|\ \ \ | | | | | | | | | | | | | | | | b8968b4b UseSWIG: Automatically scan dependencies of SWIG files for Makefiles
| * | | UseSWIG: Automatically scan dependencies of SWIG files for MakefilesAlexey Sokolov2017-01-101-0/+1
| | |/ | |/| | | | | | | Issue: #4147
* | | Merge topic 'BundleUtilities-symlink-structure'Brad King2017-01-111-3/+55
|\ \ \ | | | | | | | | | | | | | | | | b1dc4ddb BundleUtilities: Maintain symlink structure
| * | | BundleUtilities: Maintain symlink structureMartin Koegler2017-01-101-3/+55
| | | | | | | | | | | | | | | | Closes: #15047
* | | | Merge topic 'Autogen_Simplify'Brad King2017-01-111-4/+4
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7db05f42 AUTOGEN: Release notes for SKIP_AUTOX 6eabac26 AUTOGEN: Documentation update: cmake-qt, AUTOMOC, AUTOUIC, AUTORCC cbc07d33 AUTOGEN: Documentation for SKIP_AUTOX source file properties c17e0a3a AUTOGEN: Tests: AUTORCC SKIP_AUTORCC and SKIP_AUTOGEN test 53787bf8 AUTOGEN: Tests: AUTOUIC SKIP_AUTOUIC and SKIP_AUTOGEN test 8dbdd3e7 AUTOGEN: Tests: AUTOMOC SKIP_AUTOMOC and SKIP_AUTOGEN test 0699760d AUTOGEN: Generators: Do moc/uic skip test during file list generation a84f0bb7 AUTOGEN: Generators: Message upper/lower case unification 7b766b83 AUTOGEN: Generators: Use single moc/uic skip test method only 2964b8cc AUTOGEN: Generators: Use AUTOMOC/UIC/RCC instead of AUTOGEN in messages d58b6bf3 AUTOGEN: Generators: Moc/UicSkipTest methods 94c319f9 AUTOGEN: Generators: Use separate header lists for MOC and UIC 966be439 AUTOGEN: Generators: Be verbose about skipping files de531432 AUTOGEN: Generators: Remove unused variable d8e45536 AUTOGEN: Initializer: Always remember skipped files d9313a82 AUTOGEN: Initializer: Enable SKIP_AUTOGEN on all AUTOGEN generated sources ...
| * | | | AUTOGEN: Rename config variablesSebastian Holtermann2017-01-101-4/+4
| | | | | | | | | | | | | | | | | | | | The new names describe the variables use cases better.
* | | | | Merge topic 'android_clang_asm'Brad King2017-01-112-1/+5
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 524f5ee1 Android: Set compiler target platform when compiling ASM with Clang
| * | | | | Android: Set compiler target platform when compiling ASM with ClangFlorent Castelli2017-01-102-1/+5
| | |_|/ / | |/| | | | | | | | | | | | | Closes: #16535
* | | | | Merge topic 'AndroidTestUtilities-fix-cleanup'Brad King2017-01-111-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 513ef514 AndroidTestUtilities: fix cleanup operation
| * | | | | AndroidTestUtilities: fix cleanup operationRuslan Baratov2017-01-101-1/+1
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `su` is not available by default on all devices: ``` > adb shell "echo ls /data/local/tmp | su" /system/bin/sh: su: not found > echo $? 0 ``` Also since `execute_adb_command` use `execute_process` under the hood the pipeline (`|`) will not be treated as special symbol and will be process just like one more command line argument for the `adb`.
* | | | | Merge topic 'issue-16513-concrt140-dll'Brad King2017-01-111-2/+8
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 3578e862 InstallRequiredSystemLibraries: Add concrt*.dll for VC >= 14.0