summaryrefslogtreecommitdiffstats
path: root/Modules
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'FindCUDA-verbatim' into releaseBrad King2016-02-171-3/+13
|\
| * FindCUDA: Fix regression under Visual Studio generatorsBrad King2016-02-171-3/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit v3.5.0-rc1~47^2 (FindCUDA: Support special characters in path, 2016-01-15) our add_custom_command calls use VERBATIM so that CMake will automatically quote special characters correctly. However, this breaks the special `$(VCInstallDir)` placeholder used with Visual Studio generators. Since we do not support preservation of such placeholders with VERBATIM (see issue #15001) we must fall back to not using VERBATIM when the placeholder is used. A better fix would be to stop using `$(VCInstallDir)` and use the value of `CMAKE_${CUDA_C_OR_CXX}_COMPILER` instead, but that will require additional semantic and documentation changes. For now simply fix the regression with the above approach. Reported-by: Stephen Sorley <Stephen.Sorley@jhuapl.edu>
* | CMakeForceCompiler: De-deprecate until more use cases have alternativesBrad King2016-02-171-7/+9
| | | | | | | | | | | | | | | | | | | | We deprecated this module in commit v3.5.0-rc1~295^2 (CMakeForceCompiler: Deprecate this module and its macros, 2015-10-19) in order to determine whether anyone still has use cases that require it. Indeed we still need to provide a way to work with toolchains that cannot link binaries without special flags. Remove the deprecation warnings until we can provide an alternative to the module for this use case.
* | ExternalProject: Be compatible with projects setting CMAKE_CFG_INTDIRBrad King2016-02-051-2/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit v3.5.0-rc1~32^2~1 (ExternalProject: Simplify `cmake --build` configuration passing, 2016-01-19) we use the `$<CONFIG>` generator expression to generate the `cmake --build . --config <config>` value for the default BUILD_COMMAND instead of the CMAKE_CFG_INTDIR placeholder value provided by multi-config generators. However, some projects have been abusing the old implementation detail by setting CMAKE_CFG_INTDIR themselves to get a specific configuration. Those projects should be updated to set their own BUILD_COMMAND to get non-default behavior. Meanwhile we can be compatible with their existing releases by detecting when CMAKE_CFG_INTDIR is not a generator-provided placeholder and using its value instead.
* | Merge topic 'FindGit-updates'Brad King2016-02-011-13/+13
|\ \ | | | | | | | | | | | | | | | fa78ee97 FindGit: Improve documentation formatting facfb52c FindGit: Document Git_FOUND, unset internal var
| * | FindGit: Improve documentation formattingBrad King2016-01-271-8/+7
| | |
| * | FindGit: Document Git_FOUND, unset internal varChristoph Grüninger2016-01-271-8/+9
| | | | | | | | | | | | | | | | | | * Git is called Git, not git. * FindGit sets Git_FOUND, too. * Unset internal variable git_names
* | | UseJava: Fix documented name of `CLASSDIR` property (#15936)Brad King2016-01-261-1/+1
|/ / | | | | | | It is not `CLASS_DIR`.
* | Merge topic 'FindBoost-1.61'Brad King2016-01-251-2/+2
|\ \ | | | | | | | | | | | | b94e855d FindBoost: Add support for Boost 1.61
| * | FindBoost: Add support for Boost 1.61Sergei Nikulov2016-01-221-2/+2
| | |
* | | Merge topic 'FindPNG-imported-targets'Brad King2016-01-221-7/+43
|\ \ \ | | | | | | | | | | | | | | | | 9b08c623 FindPNG: Create an imported PNG::PNG target (#15911)
| * | | FindPNG: Create an imported PNG::PNG target (#15911)Sam Thursfield2016-01-211-7/+43
| | | | | | | | | | | | | | | | | | | | | | | | Imported targets are now the recommended way of dealing with external library dependencies. Add one for FindPNG and update documentation accordingly. Also add a test case activated by CMake_TEST_FindPNG.
* | | | Merge topic 'fix-pkg_search_module-cache'Brad King2016-01-221-0/+3
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | 40249bcc FindPkgConfig: set standard variables in the cache
| * | | FindPkgConfig: set standard variables in the cacheBen Boeckel2016-01-211-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes a regression introduced when the code was simplified to use the variable queries. Fixes #15903. Reported-by: Bernd Lörwald
* | | | Merge topic 'add-FindXalanC'Brad King2016-01-211-0/+162
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | f9e45ab9 FindXalanC: New module to find the Apache Xalan-C++ library
| * | | | FindXalanC: New module to find the Apache Xalan-C++ libraryRoger Leigh2016-01-201-0/+162
| | | | |
* | | | | Merge topic 'ExternalProject-ctest-config'Brad King2016-01-211-3/+6
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ec00e89e ExternalProject: Fix TEST_BEFORE_INSTALL for multi-config generators 5d739a3c ExternalProject: Simplify `cmake --build` configuration passing
| * | | | | ExternalProject: Fix TEST_BEFORE_INSTALL for multi-config generatorsBrad King2016-01-201-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In multi-config generators we must tell `ctest` what configuration to test. Reported-by: Taylor Braun-Jones <taylor@braun-jones.org>
| * | | | | ExternalProject: Simplify `cmake --build` configuration passingBrad King2016-01-201-3/+3
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | Check CMAKE_CONFIGURATION_TYPES instead of CMAKE_CFG_INTDIR in order to recognize multi-config generators. Then use $<CONFIG> to pass the configuration value.
* | | | | Merge topic 'GetPrerequisites-ms-ucrt'Brad King2016-01-211-2/+2
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | c8daac35 GetPrerequisites: Define api-ms-win-* files as system libraries (#15691)
| * | | | GetPrerequisites: Define api-ms-win-* files as system libraries (#15691)André Klitzing2016-01-191-2/+2
| |/ / / | | | | | | | | | | | | Suggested-by: Gilles Khouzam <gillesk@microsoft.com>
* | | | Merge topic 'java-updates'Brad King2016-01-201-2/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 18c3714f UseJava: Fix create_javah CLASSPATH handling on Windows
| * | | | UseJava: Fix create_javah CLASSPATH handling on WindowsMarc Chevrier2016-01-191-2/+2
| |/ / / | | | | | | | | | | | | Preserve semicolons in the value.
* | | | FindPkgConfig: Quote ${_pkgconfig_path} to protect semicolons on WindowsRob Gowin2016-01-191-4/+4
|/ / /
* | | Merge topic 'FindPkgConfig-fix-restore'Brad King2016-01-191-1/+1
|\ \ \ | | | | | | | | | | | | | | | | 8979a107 FindPkgConfig: Fix restoration of PKG_CONFIG_PATH in environment
| * | | FindPkgConfig: Fix restoration of PKG_CONFIG_PATH in environmentRob Gowin2016-01-151-1/+1
| |/ / | | | | | | | | | | | | | | | The original value is saved in `_pkg_config_path_old`. Fix this typo left by commit v3.1.0-rc1~763^2 (FindPkgConfig: Extend PKG_CONFIG_PATH using CMake variables, 2014-03-06).
* | | Merge topic 'ExternalProject-git-clone-o'Brad King2016-01-191-6/+17
|\ \ \ | | | | | | | | | | | | | | | | 83d63391 ExternalProject: Add option to set `git clone -o` argument
| * | | ExternalProject: Add option to set `git clone -o` argumentAdam Rankin2016-01-151-6/+17
| |/ / | | | | | | | | | | | | | | | | | | | | | Add a `GIT_REMOTE_NAME` option to `ExternalProject_Add` to support git clone --origin <name> Default to `origin` if not specified.
* | | Merge topic 'FindCUDA-verbatim'Brad King2016-01-191-0/+3
|\ \ \ | | |/ | |/| | | | | | | 6ccc3070 FindCUDA: Support special characters in path (#15919)
| * | FindCUDA: Support special characters in path (#15919)Brad King2016-01-151-0/+3
| |/ | | | | | | | | | | | | | | Add `VERBATIM` to all `add_custom_command` calls so that CMake will escape arguments properly even when special characters such as "()" are present. Suggested-by: Nils Gladitz <nilsgladitz@gmail.com>
* | Windows: Find Program Files directories more robustly from environmentBrad King2016-01-151-33/+19
|/ | | | | | | | | | | In Modules/Platform/WindowsPaths.cmake our previously recorded environment variable combinations no longer seem to be correct. For example, a 64-bit cmake binary may see ProgramW6432 in the environment and end up not considering the "ProgramFiles(x86)" variable. Instead check for all possible environment variables in the preferred order and then remove duplicates. Reported-by: Shawn Waldon <shawn.waldon@kitware.com>
* Merge topic 'FindDCMTK-update'Brad King2016-01-141-46/+229
|\ | | | | | | | | | | | | | | | | | | 4b24626e FindDCMTK: Simplify documentation. 361c199f FindDCMTK: Add reStructuredText formatting. d790f4fe FindDCMTK: Keep original copyright notice. 8c8e53d0 FindDCMTK: Minor documentation grammatical issues. d50cbbb0 FindDCMTK: Obey QUIET option for find_package. 31b4700e FindDCMTK: Improve compatibility with DCMTKConfig.cmake.
| * FindDCMTK: Simplify documentation.Matt McCormick2016-01-141-40/+18
| |
| * FindDCMTK: Add reStructuredText formatting.Matt McCormick2016-01-121-47/+51
| |
| * FindDCMTK: Keep original copyright notice.Matt McCormick2016-01-121-1/+1
| | | | | | | | | | | | This is a follow-up to 31b4700ed640bee962f9db9ce25fa84261a944d2. Remove the extra character that was added to ensure the CMake.ModuleNotices test passes.
| * FindDCMTK: Minor documentation grammatical issues.Matt McCormick2016-01-121-9/+4
| | | | | | | | Also remove CTK integration reference to avoid confusion.
| * FindDCMTK: Obey QUIET option for find_package.Matt McCormick2016-01-111-5/+17
| |
| * FindDCMTK: Improve compatibility with DCMTKConfig.cmake.Jean-Christophe Fillion-Robin2016-01-111-45/+239
| | | | | | | | | | | | | | | | | | | | This improvement to the FindDCMTK module improves compatibility with recent DCMTK, which provides a DCMTKConfig.cmake file. See the module comments for a compatibility matrix. It also provides DCMTK_INCLUDE_DIRS. Ported from CommonTK (commontk.org).
| * Merge branch 'fix-CMP0065-NEW-AIX-HP' into releaseBrad King2015-12-114-4/+28
| |\
* | | FindPkgConfig: add PREFIX/share/pkgconfig to PKG_CONFIG_PATH (#15910)Sam Thursfield2016-01-121-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Most packages install their .pc files into PREFIX/lib/pkgconfig, but some put them into PREFIX/share/pkgconfig. Either is valid, and pkg-config itself looks in both for the /usr and /usr/local prefixes. This fixes an issue where some packages (yajl, for example) are not found if they are installed into a non-standard prefix and CMAKE_PREFIX_PATH is used to locate them.
* | | Merge topic 'FindwxWidgets-use-isystem'Brad King2016-01-121-12/+0
|\ \ \ | | | | | | | | | | | | | | | | 4d05f195 FindwxWidgets: Drop suppression of -isystem
| * | | FindwxWidgets: Drop suppression of -isystemBrad King2016-01-111-12/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was added by commit v2.8.0~2292 (... Set variable wxWidgets_INCLUDE_DIRS_NO_SYSTEM on the Mac ..., 2008-04-16) and updated by commit v2.8.9~183^2 (FindwxWidgets: Do not use -isystem on OpenBSD, 2012-05-14). Since the underlying cause was never investigated fully we do not know the conditions under which -isystem breaks wxWidgets, but suppressing -isystem is problematic for users that do not want to see warnings in wxWidgets headers. Simply drop the special case for now so we can see whether anyone hits the problem again, at which point it can be investigated in more detail. Reported-by: Simon Wells <swel024@gmail.com>
* | | | Record compile features for MinGW Clang on Windows (#15897)Brad King2016-01-111-2/+2
|/ / / | | | | | | | | | | | | | | | Drop the 'UNIX' condition on Clang compiler features. This enables use of compile features with MinGW Clang, though additional work may be needed for clang-cl.
* | | FindBLAS: Fix pattern matching on BLAS vendor nameBrad King2016-01-081-6/+6
| | | | | | | | | | | | | | | | | | | | | The if(STREQUAL) expressions do not support globbing expressions. Use regular experssions with MATCHES instead. Reported-by: Yahui Wang <youngqv@foxmail.com>
* | | Merge topic 'cray-prgev-cleanup'Brad King2016-01-071-2/+5
|\ \ \ | | | | | | | | | | | | | | | | 64e26850 CrayPrgEnv: Cleanup binaries from implicit compile flag detection
| * | | CrayPrgEnv: Cleanup binaries from implicit compile flag detectionChuck Atkins2015-12-291-2/+5
| | | |
* | | | Merge topic 'vs-compiler-id-itanium'Brad King2016-01-071-3/+0
|\ \ \ \ | |/ / / |/| | | | | | | | | | | d9bf5206 CMakeDetermineCompilerId: Fix VS Itanium platform name (#15889)
| * | | CMakeDetermineCompilerId: Fix VS Itanium platform name (#15889)Brad King2015-12-211-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | VS expects the platform to be just `Itanium`, so drop the incorrect special case mapping it to `ia64`. This platform name has been wrong since the logic was added by commit v2.8.10~148^2~8 (VS: Detect the compiler id and tool location, 2012-08-16).
* | | | Merge topic 'fix-absolute-libs-for-cray-wrappers'Brad King2015-12-211-6/+11
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 928d2085 CrayPrgEnv: Don't use absolute paths for imlicit libraries
| * | | | CrayPrgEnv: Don't use absolute paths for imlicit librariesChuck Atkins2015-12-181-6/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When parsing implicit include dirs, link dirs, and link libs, all arguments are resolved to absolute paths instead of relative paths. This is correct for link and include directories but link libraries should only include the library name, not it's path.
generated by cgit v0.12 at 2025-01-11 04:51:57 (GMT)