summaryrefslogtreecommitdiffstats
path: root/Modules
Commit message (Collapse)AuthorAgeFilesLines
* 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 '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
| * | | | | InstallRequiredSystemLibraries: Add concrt*.dll for VC >= 14.0Taylor Braun-Jones2016-12-161-2/+8
| |/ / / / | | | | | | | | | | | | | | | Fixes #16513
* | | | | Merge topic 'FindOpenSSL-check-both'Brad King2017-01-111-7/+6
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 696339a9 FindOpenSSL: Check that both CRYPTO and SSL libraries are present
| * | | | | FindOpenSSL: Check that both CRYPTO and SSL libraries are presentHarry Mallon2017-01-101-7/+6
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Strawberry perl on Windows installs one that is found by the default finder While at it, de-duplicate code setting `OPENSSL_LIBRARIES`.
* | | | | Merge topic 'pgsql-yum'Brad King2017-01-111-1/+6
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 5ffee691 FindPostgreSQL: automatically find installations from yum.postgresql.org
| * | | | | FindPostgreSQL: automatically find installations from yum.postgresql.orgRolf Eike Beer2017-01-101-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In commit v3.3.0-rc1~4^2 (FindPostgreSQL: Search some more common packaging locations) the PostgreSQL_ADDITIONAL_SEARCH_PATHS variable was removed. This was used e.g. by osm2pgsql to be able to build on CentOS with recent PostgreSQL versions. At least add those locations from yum.postgresql.org, which is a more or less official location.
* | | | | | Merge topic 'FindBoost-1.63'Brad King2017-01-111-1/+16
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | a9b93501 FindBoost: Add support for 1.63
| * | | | | | FindBoost: Add support for 1.63Roger Leigh2017-01-101-1/+16
| |/ / / / /
* | | | | | Merge topic 'FindGTest-fixups'Brad King2017-01-111-4/+10
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8deb913d FindGTest: add lib search path for MSVC x64 platform eadd395a FindGTest: Fix documented GTEST_MSVC_SEARCH default value
| * | | | | | FindGTest: add lib search path for MSVC x64 platformDong XiaoC2017-01-101-2/+8
| | | | | | |
| * | | | | | FindGTest: Fix documented GTEST_MSVC_SEARCH default valueDong XiaoC2017-01-101-2/+2
| | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Documentation updates in commit v3.5.0-rc1~124^2~2 (FindGTest: Add imported targets and update documentation, 2015-12-10) accidentally changed the documented default to the wrong value. Restore the documentation to refer to the actual default used in the implementation.
* | | | | | Merge topic 'FindBoost-find-default'Brad King2017-01-111-10/+12
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | ff91b151 FindBoost: Search official location of prebuilt binaries on Windows
| * | | | | FindBoost: Search official location of prebuilt binaries on WindowsAlex Turbov2017-01-101-10/+12
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | Make it possible to find Boost in the default install path (`c:\boost`) of an official prebuilt binaries installation even when `BOOST_ROOT` has not been specified.
* | | | | Merge topic 'cpack-rpm-user-binary-spec-file-fix'Brad King2017-01-101-1/+1
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | 574c81e2 CPack/RPM fix - custom binary spec file handling
| * | | | CPack/RPM fix - custom binary spec file handlingDomen Vrankar2017-01-101-1/+1
| | |/ / | |/| | | | | | | | | | Fixes #16507
* | | | Merge topic 'cpack-deb-package-version-override-fix'Brad King2017-01-091-2/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 2f4e5ed6 CPackDeb: use CPACK_DEBIAN_PACKAGE_VERSION
| * | | | CPackDeb: use CPACK_DEBIAN_PACKAGE_VERSIONDaniel Pfeifer2016-12-201-2/+2
| | |/ / | |/| |
* | | | PGI: Add support for Fortran with the Ninja generatorDaniel Carrera2016-12-161-0/+3
|/ / / | | | | | | | | | | | | | | | | | | The PGI documentation says that `-Mpreprocess` "instructs the compiler to perform cpp-like preprocessing on assembly and Fortran input source files". The `-E` flag causes the compiler to spit the result to stdout instead of saving it to a file.
* | | Merge topic 'FindGit-fix-cross-compile'Brad King2016-12-161-1/+1
|\ \ \ | | | | | | | | | | | | | | | | caeb6d1d FindGit: Fix check for Windows host
| * | | FindGit: Fix check for Windows hostJosé Simões2016-12-151-1/+1
| | | | | | | | | | | | | | | | | | | | When cross-compiling to or from a Windows platform we should still find a Git for the host environment.
* | | | Merge topic 'FindPythonLibs-tolerate-components'Brad King2016-12-161-6/+13
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | a12d8a03 FindPythonLibs: Tolerate call with PYTHON_LIBRARY already a list
| * | | | FindPythonLibs: Tolerate call with PYTHON_LIBRARY already a listFrancois Budin2016-12-151-6/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `PYTHON_LIBRARY` may contain a list because of `SelectLibraryConfigurations`. If it is the case, the list can be: optimized;<FILEPATH_TO_RELEASE_LIBRARY>;debug;<FILEPATH_TO_DEBUG_LIBRARY> Instead of directly using the value of `PYTHON_LIBRARY` in the CMake function `get_filename_component()`, we loop over the content of the relevant parts of `PYTHON_LIBRARY` and `PYTHON_DEBUG_LIBRARY` whether they are lists or not. Suggested-by: Brad King <brad.king@kitware.com>
* | | | | Merge topic 'csharp_support_compiler_detection'Brad King2016-12-168-2/+367
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 5c6c0344 C# support: add compiler detection for MSVC
| * | | | | C# support: add compiler detection for MSVCMichael Stürmer2016-12-158-2/+367
| | |_|_|/ | |/| | |
* | | | | FindPNG: Fix small typo fix in module helpMaxime Morel2016-12-151-1/+1
| |_|/ / |/| | |
* | | | Merge topic 'cuda-implicit-libs'Brad King2016-12-141-23/+54
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | e3f404fe CUDA: Implement nvcc implicit link line extraction more robustly
| * | | | CUDA: Implement nvcc implicit link line extraction more robustlyBrad King2016-12-131-23/+54
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Do not assume that the implicit link line is the last line of the output from `nvcc -v`. Instead first find the `LIBRARIES=` line, and then look for that content on a later line. It appears twice. First on a call to `nvlink`, which we ignore. Later it appears on the implicit link line. Extract the latter line. On failure, abort with a `FATAL_ERROR` so that the user does not try to build without proper link information. Once we have the line, parse it with `separate_arguments` using the `UNIX_COMMAND` option just like `CMakeParseImplicitLinkInfo` already does. This robustly parses the command line and removes quoting. Then extract the first argument as the host link launcher.
* | | | | Merge topic 'GNUInstallDirs-cache-type'Brad King2016-12-141-64/+66
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | | | | | | 53b5d634 GNUInstallDirs: Set UNINITALIZED cache properties to type PATH c968213d GNUInstallDirs: Unify path logic into helper macros
| * | | | GNUInstallDirs: Set UNINITALIZED cache properties to type PATHRoger Leigh2016-12-121-0/+17
| | | | | | | | | | | | | | | | | | | | Also convert the path to a cmake path