summaryrefslogtreecommitdiffstats
path: root/Modules
Commit message (Collapse)AuthorAgeFilesLines
* 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
| * | | GNUInstallDirs: Unify path logic into helper macrosRoger Leigh2016-12-121-66/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Unify path handling: Rather than repeat the same logic for each individual path create two macros which can be used throughout the module. - Capitalise helpstrings to match the conventions used by the standard CMake properties
* | | | Merge topic 'GetPrerequisites-fix-find_program-call'Brad King2016-12-131-2/+2
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | 1d1f29f4 GetPrerequisites: Fix call to find_program for `ri` tool
| * | | GetPrerequisites: Fix call to find_program for `ri` toolMartin Koegler2016-12-121-2/+2
| | |/ | |/| | | | | | | | | | `find_program` does not work with `${a};${b}` as a search path. Use separate arguments to `PATHS`.
* | | Merge topic 'cuda-fixups'Brad King2016-12-121-5/+5
|\ \ \ | |/ / |/| | | | | | | | | | | c1a55079 CUDA: Fix Cuda.Complex test case extern function signatures 7552d16d CUDA: Fix default compiler flag initialization
| * | CUDA: Fix default compiler flag initializationBrad King2016-12-091-5/+5
| | | | | | | | | | | | | | | | | | | | | Since commit v3.7.0-rc1~392^2 (Honor CMAKE_<LANG>_FLAGS[_<CONFIG>]_INIT set in toolchain files, 2016-07-05) our convention is to initialize compiler flag variables via `string(APPEND)` rather than `set()`. Fix the convention for `CMAKE_CUDA_FLAGS[_<CONFIG>]_INIT`.
* | | Merge topic 'FindBoost-vs15'Brad King2016-12-091-2/+6
|\ \ \ | |/ / |/| | | | | | | | c3b6b5ba FindBoost: Add support for VS 2017
| * | FindBoost: Add support for VS 2017Vic Luo2016-12-081-2/+6
| | |
| * | Merge branch 'backport-android-info-variables' into releaseBrad King2016-11-183-2/+29
| |\ \
| | * | Android: Add CMAKE_<LANG>_ANDROID_TOOLCHAIN_MACHINEBrad King2016-11-183-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Expose the binutils' machine name (typically used as a prefix on the tool names) publicly. This is expected to match the `gcc -dumpmachine` value. Suggested-by: Ruslan Baratov <ruslan_baratov@yahoo.com>
| | * | Android: Add CMAKE_ANDROID_NDK_TOOLCHAIN_HOST_TAG variableBrad King2016-11-183-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The NDK provides prebuilt toolchain files in directories named for the host architecture. The NDK build system calls this `HOST_TAG`. Expose the value publicly for use by clients that need to pass it to external tools. Suggested-by: Ruslan Baratov <ruslan_baratov@yahoo.com>
| | * | Android: Always set CMAKE_ANDROID_NDK_TOOLCHAIN_VERSIONBrad King2016-11-183-2/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When this variable is not set by the user or toolchain file, set it to the default selected. This will be useful for client code that needs to pass the value to an external tool that needs to find the same toolchain in the NDK. Leave it empty for a standalone toolchain. Suggested-by: Ruslan Baratov <ruslan_baratov@yahoo.com>
| * | | Merge branch 'armcc-response-file-flag' into releaseBrad King2016-11-151-0/+1
| |\ \ \
* | | | | CPack/DEB shlibdep options depend on file utilityHenning Meyer2016-12-071-1/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Missing or missconfigured file utility should not skip adding dependencies. Instead it should print out a fatal error message. Fixes #16486
* | | | | QtAutogen: Rename variable templates in config templateSebastian Holtermann2016-12-061-4/+4
| | | | |
* | | | | QtAutogen: Rename config AM_RELAXED_MODE to AM_MOC_RELAXED_MODESebastian Holtermann2016-12-061-1/+1
| |_|_|/ |/| | |
* | | | Merge topic 'FindOpenGL-imported-targets'Brad King2016-12-061-0/+59
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 027ce359 FindOpenGL: Provide imported targets for GL and GLU
| * | | | FindOpenGL: Provide imported targets for GL and GLUBrad King2016-12-021-0/+59
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Create OpenGL::GL and OpenGL::GLU imported targets using the locations found. This feature was originally added by commit v3.1.0-rc1~420^2~2 (FindOpenGL: Provide imported targets for GL and GLU, 2014-05-31) but had to be reverted by commit v3.1.0-rc3~10^2 (FindOpenGL: Revert support for imported targets, 2014-12-01) due to issue #15267. Since then we added support for `IMPORTED_LIBNAME` to interface libraries, so use it to handle the case where we have only the library name without an absolute path. Inspired-by: Philipp Möller <bootsarehax@googlemail.com> Closes: #15267
* | | | | Merge topic 'features-c++17'Brad King2016-12-0514-18/+62
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 97c1e569 Help: Add release note for C++ 17 support 85c8e652 Features: Activate C++ 17 support for AppleClang 6.1+ 8084f7a6 Features: Activate C++ 17 support for Clang 3.5+ 24e29d41 Features: Activate C++ 17 support for GNU 5.1+ ae1a6815 Features: Add infrastructure for C++ 17 language standard 684e4d20 Features: Make feature recording conditions more consistent
| * | | | | Features: Activate C++ 17 support for AppleClang 6.1+Brad King2016-12-021-0/+8
| | | | | |
| * | | | | Features: Activate C++ 17 support for Clang 3.5+Brad King2016-12-021-0/+8
| | | | | |
| * | | | | Features: Activate C++ 17 support for GNU 5.1+Brad King2016-12-021-0/+8
| | | | | |
| * | | | | Features: Add infrastructure for C++ 17 language standardBrad King2016-12-025-2/+14
| | | | | | | | | | | | | | | | | | | | | | | | Issue: #16468
| * | | | | Features: Make feature recording conditions more consistentBrad King2016-12-029-16/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Condition all calls to `_record_compiler_features_{c,cxx}` on `_result EQUAL 0` so that adding new language standards later does not need to update them. Avoid some duplicate compiler version checks by conditioning C11 and CXX14 feature recording on the existence of `CMAKE_{C11,CXX14}_STANDARD_COMPILE_OPTION` (whose setting already used the version check).
* | | | | | Merge topic 'cpack-rpm-user-file-list-with-multiple-directives'Brad King2016-12-051-5/+8
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4e4b786e CPack/RPM CPACK_RPM_USER_FILELIST change release note a5a6f61b CPackRPM now supports multiple directives in CPACK_RPM_USER_FILELIST
| * | | | | | CPackRPM now supports multiple directives in CPACK_RPM_USER_FILELISTHarry Mallon2016-12-031-5/+8
| | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * In older version "%dir %attr(-, root, root) foo" would put "%dir foo" in the final spec file. * Also added comment to describe this and advise not not to add trailing slashes to directories in USER_FILELIST. * Includes test in RunCMake CPack which now passes.
* | | | | | CMakeDetermineASMCompiler: arg-split ASM* env var like CCMichał Górny2016-12-021-1/+7
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Split the arguments off of the `ASM${ASM_DIALECT}` environment variable as is done for `CC` and other compiler variables. This fixes using CMake when `ASM*` is used to pass additional target flags, e.g. when one uses `ASM=${CC}`.
* | | | | Merge topic 'pgi-macos-flags'Brad King2016-12-014-0/+20
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | 571721c5 PGI: Pass macOS-specific link flags directly to linker
| * | | | PGI: Pass macOS-specific link flags directly to linkerBrad King2016-11-304-0/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The PGI compiler on macOS does not support some macOS-specific flags so pass them through `-Wl,` to the linker directly. Issue: #16457
* | | | | Merge topic 'CMakeGraphVizOptions-docs'Brad King2016-11-301-3/+10
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | f7c2a803 CMakeGraphVizOptions: Minor improvements to docs.
| * | | | | CMakeGraphVizOptions: Minor improvements to docs.Harry Mallon2016-11-291-3/+10
| |/ / / / | | | | | | | | | | | | | | | | | | | | * Add `GRAPHVIZ_GRAPH_TYPE` options. * Correct inaccurate usage info.
* | | | | Merge topic 'FindPythonLibs-tolerate-relative-exe'Brad King2016-11-301-4/+4
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 9db0dfd7 FindPythonLibs: Tolerate a non-absolute PYTHON_EXECUTABLE
| * | | | | FindPythonLibs: Tolerate a non-absolute PYTHON_EXECUTABLEBrad King2016-11-281-4/+4
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The `PYTHON_EXECUTABLE` variable normally contains an absolute path, but tolerate cases when it does not without calling `get_filename_component` with an incorrect number of arguments. Closes: #16452
* | | | | Merge topic 'cpack-ifw-options'Brad King2016-11-301-6/+68
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 88ecfd8b CPackIFW: Add some options
| * | | | | CPackIFW: Add some optionsKonstantin Podsvirov2016-11-241-6/+68
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | New options is: DEFAULT, VIRTUAL, FORCED_INSTALLATION, DISPLAY_NAME, DESCRIPTION and RELEASE_DATE. Options added for both cpack_ifw_configure_component and cpack_ifw_configure_component_group command.
* | | | | Merge topic 'UseSWIG-java-outputs'Brad King2016-11-301-3/+4
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 62c4cb4b UseSWIG: Record generated java files as custom command outputs
| * | | | | UseSWIG: Record generated java files as custom command outputscaryoscelus2016-11-291-3/+4
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | When another target depends on the generated files CMake must know which custom command generates them in order to hook up the dependency properly. We already do this for Python. Add the Java files too.
* | | | | Merge topic 'find-module-cleanup-sweep'Brad King2016-11-2948-111/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 745b56f5 Find*.cmake: drop the comments before including FPHSA 0ab9cb46 FindLibArchive: do not set LibArchive_FOUND explicitly 703d1943 FindLibArchive: use CMAKE_CURRENT_LIST_DIR to find FPHSA
| * | | | | Find*.cmake: drop the comments before including FPHSARolf Eike Beer2016-11-2848-106/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | No need to explain this over and over again. While at it, do some other minor cleanups to whitespace and comments (i.e. delete them).
| * | | | | FindLibArchive: do not set LibArchive_FOUND explicitlyRolf Eike Beer2016-11-281-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | FPHSA already does this.
generated by cgit v0.12 at 2024-11-15 00:49:24 (GMT)