summaryrefslogtreecommitdiffstats
path: root/Modules
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'apple-clang-id'Brad King2013-10-097-2/+17
|\ | | | | | | | | | | | | 1763c31 Set policy CMP0025 to NEW while building CMake itself aa53ee5 Add policy CMP0025 for Apple Clang compiler id compatibility ab65862 Clang: Add separate "AppleClang" compiler id
| * Clang: Add separate "AppleClang" compiler idBrad King2013-10-087-2/+17
| | | | | | | | | | | | | | | | | | | | | | | | Apple distributes their own Clang build with their own version numbers that differ from upstream Clang. Use the __apple_build_version__ symbol to identify the Apple Clang compiler and report the Apple Build Version as the fourth version component in CMAKE_<LANG>_COMPILER_VERSION. Add Compiler/AppleClang-<lang> and Platform/Darwin-AppleClang-<lang> modules that simply include the upstream equivalents. Fix comparisons of CMAKE_<LANG>_COMPILER_ID to Clang in CMake's own source and tests to account for AppleClang.
* | Merge topic 'clang-cl-compiler'Brad King2013-10-0813-14/+133
|\ \ | | | | | | | | | | | | | | | | | | 3d8356d Clang: Support Windows variants for GNU and MSVC (#13035, #14458) 51ab85c CMakeDetermineCompilerId: Add notion of "simulated" id/version be10826 CMakeDetermineCompilerId: Fix local var init
| * | Clang: Support Windows variants for GNU and MSVC (#13035, #14458)Brad King2013-10-049-12/+74
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Teach the compiler identification preprocessor tests to report when Clang simulates MSVC, and what version. If not MSVC, assume GNU. Teach compiler information modules Clang-(C|CXX) to recognize when Clang simulates MSVC and skip loading the GNU information. Teach the Windows-MSVC platform information to recognize when it is loaded as the simulated compiler and use that version information instead of the real compiler's (different) version scheme. Add platform modules Windows-Clang-(C|CXX) and support module Windows-Clang to load either Windows-MSVC or Windows-GNU and wrap the corresponding information macros.
| * | CMakeDetermineCompilerId: Add notion of "simulated" id/versionBrad King2013-10-046-1/+57
| | | | | | | | | | | | | | | | | | | | | | | | | | | Some compilers try to simulate other compilers as a drop-in replacement supporting all the same command-line options and predefined preprocessor macros. In such cases it will be useful to have CMake load the compiler information files for the simulated compiler instead of duplicating the information. Teach CMakeDetermineCompilerId to extract the simulated compiler id and version when the compiler id detection provides it.
| * | CMakeDetermineCompilerId: Fix local var initBrad King2013-10-041-1/+2
| |/ | | | | | | | | Add initialization of the ARCHITECTURE_ID local and fix the initialization of the COMPILER_ID_TWICE local.
* | Merge topic 'FindGTK2-quiet'Brad King2013-10-081-1/+4
|\ \ | | | | | | | | | | | | | | | | | | 1bbc766 FindGTK2: Search for modules quietly when needed d9eb277 FindGTK2: Find freetype quietly 675a4d3 FindGTK2: Mark GTK_*_INCLUDE_DIR as advanced
| * | FindGTK2: Search for modules quietly when neededDaniele E. Domenichelli2013-10-081-0/+2
| | |
| * | FindGTK2: Find freetype quietlyDaniele E. Domenichelli2013-10-081-1/+1
| | |
| * | FindGTK2: Mark GTK_*_INCLUDE_DIR as advancedDaniele E. Domenichelli2013-10-081-0/+1
| | |
* | | Merge topic 'CheckStructHasMember_CXX'Brad King2013-10-081-9/+26
|\ \ \ | | | | | | | | | | | | | | | | 73d28d2 CheckStructHasMember: Add support for C++
| * | | CheckStructHasMember: Add support for C++Daniele E. Domenichelli2013-10-081-9/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously if headers required to check if a struct has a member can be compiled with C++ compiler only, the check would fail because the C compiler fails. As a consequence, the result variable would be set to false, even if the struct has that particular member. Teach CHECK_STRUCT_HAS_MEMBER to accept a new optional argument LANGUAGE that allows one to explicitly set the compiler to use. The new signature is therefore: CHECK_STRUCT_HAS_MEMBER (<struct> <member> <header> <variable> [LANGUAGE <language>])
* | | | Merge topic 'cxx-flags'Brad King2013-10-083-25/+51
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | 455bad1 Check*CompilerFlag: Add SunStudio 12 regex 6f3ebfe Check*CompilerFlag: make C and CXX modules share most error patterns (#14339)
| * | | | Check*CompilerFlag: Add SunStudio 12 regexWilliam Orr2013-10-081-0/+1
| | | | | | | | | | | | | | | | | | | | Applied-by: Rolf Eike Beer <eike@sf-mail.de>
| * | | | Check*CompilerFlag: make C and CXX modules share most error patterns (#14339)Rolf Eike Beer2013-08-133-25/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This simplifies maintenance as most patterns will be for both modules and may be added at a central place. While at it add error patterns for XL and BCC.
* | | | | Merge topic 'UseJava-jar-manifest'Brad King2013-10-071-3/+13
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 69aff17 UseJava: Add support for the jar 'm' (Manifest) option
| * | | | | UseJava: Add support for the jar 'm' (Manifest) optionSimon Levermann2013-09-231-3/+13
| | | | | |
* | | | | | Merge topic 'deprecation-macro-refactor'Brad King2013-10-071-2/+8
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cdf55d5 GEH: Make each element of the deprecation macros overridable. 80d5090 GEH: Use the macro for the deprecation attribute after definiting it.
| * | | | | | GEH: Make each element of the deprecation macros overridable.Stephen Kelly2013-09-231-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This way, we can override only FOO_DEPRECATED to silence deprecation for a library.
| * | | | | | GEH: Use the macro for the deprecation attribute after definiting it.Stephen Kelly2013-09-231-2/+2
| |/ / / / / | | | | | | | | | | | | | | | | | | This way, it is more-easily overridden.
* | | | | | Merge topic 'EclipseFixWarningMessage'Brad King2013-10-071-19/+27
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5f11b8d Eclipse: add version 4.3 for completeness 2b63734 Eclipse: print different message if CMAKE_ECLIPSE_VERSION is already set 1ff8c21 CMakeFindEclipse: use lowercase for macro calls
| * | | | | | Eclipse: add version 4.3 for completenessAlex Neundorf2013-09-181-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This just adds the version number, there are no features depending on this. Alex
| * | | | | | Eclipse: print different message if CMAKE_ECLIPSE_VERSION is already setAlex Neundorf2013-09-181-17/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes #14422. Alex
| * | | | | | CMakeFindEclipse: use lowercase for macro callsAlex Neundorf2013-09-181-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Alex
* | | | | | | Merge topic 'openssl-advanced'Brad King2013-10-071-0/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 864e2a3 FindOpenSSL: mark variables as advanced for MSVC (#14418)
| * | | | | | | FindOpenSSL: mark variables as advanced for MSVC (#14418)Rolf Eike Beer2013-09-171-0/+2
| | | | | | | |
* | | | | | | | Merge topic 'FixTypoInGraphvizDocs'Brad King2013-10-071-1/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bbb0d6f CMakeGraphVizOptions.cmake: Fix typo in documentation
| * | | | | | | | CMakeGraphVizOptions.cmake: Fix typo in documentationAlex Neundorf2013-09-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Alex
* | | | | | | | | Merge topic 'FindwxWidgets-msvc-x64'Brad King2013-10-071-0/+2
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 870f91e FindwxWidgets: Look in x64 directories for MSVC (#14393)
| * | | | | | | | | FindwxWidgets: Look in x64 directories for MSVC (#14393)Marius Luca2013-09-101-0/+2
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When compiling the 64 bit version of wxWidgets using nmake the library folders become vc_x64_lib and vc_x64_dll and can coexist with the win32 version.
* | | | | | | | | Merge topic 'vs-compiler-id-tolerate-diagnostics'Brad King2013-10-071-1/+2
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8c891f8 VS: Tolerate diagnostic output while detecting cl (#14387)
| * | | | | | | | | VS: Tolerate diagnostic output while detecting cl (#14387)Brad King2013-09-031-1/+2
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the VS IDE build output setting Tools -> Options -> Projects and Solutions -> Build and Run -> MSBuild project output verbosity is set to "Diagnostic" the build output contains a " (TaskId:###)" suffix on the CMAKE_<lang>_COMPILER= line used to extract the compiler executable location. Strip this suffix before checking that the reported location exists.
* | | | | | | | | Merge topic 'deprecate-add_compiler_export_flags'Brad King2013-10-071-13/+34
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0f3a666 GenerateExportHeader: Deprecate add_compiler_export_flags function.
| * | | | | | | | | GenerateExportHeader: Deprecate add_compiler_export_flags function.Stephen Kelly2013-09-021-13/+34
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is made obsolete by the CXX_VISIBILITY_PRESET and VISIBILITY_INLINES_HIDDEN target properties.
* | | | | | | | | Merge topic 'FindPython_versions'Brad King2013-10-072-14/+14
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | afd4f7f FindPython*: simplify version selection
| * | | | | | | | | FindPython*: simplify version selectionRolf Eike Beer2013-08-312-14/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CMake already provides the version components split into variables, no need to split them again.
* | | | | | | | | | Merge topic 'FindLua'Brad King2013-10-071-0/+153
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 89cfa20 Modules: add FindLua.cmake
| * | | | | | | | | | Modules: add FindLua.cmakeRolf Eike Beer2013-08-311-0/+153
| |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a version agnostic variant of FindLua50.cmake and FindLua51.cmake.
* | | | | | | | | | Merge topic 'add-find_dependency-macro'Brad King2013-10-071-2/+37
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bb501a2 CMakePackageConfigHelpers: Add a find_dependency macro
| * | | | | | | | | | CMakePackageConfigHelpers: Add a find_dependency macroStephen Kelly2013-08-301-2/+37
| | |/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This macro handles the EXACT, REQUIRED and QUIET options and sets an appropriate NOT_FOUND_MESSAGE for the package if a dependency is not found.
* | | | | | | | | | Merge topic 'FortranCInterface-cross-compile'Brad King2013-10-071-1/+1
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | d7a65a2 FortranCInterface: Fix cross-compiling Linux to MinGW (#14358)
| * | | | | | | | | FortranCInterface: Fix cross-compiling Linux to MinGW (#14358)Michel Zou2013-08-141-1/+1
| | |_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | After building the test binary tell find_program to search for it with the ${CMAKE_EXECUTABLE_SUFFIX} so that the .exe can be found. Since find_program is normally used to locate host tools while cross-compiling it needs this hint to find the target binary. Suggested-by: Denis Barbier <bouzim@gmail.com>
* | | | | | | | | OS X: Search system SDKs for frameworksBrad King2013-09-271-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In Modules/Platform/Darwin.cmake set CMAKE_SYSTEM_FRAMEWORK_PATH to include framework directories from inside the system SDK corresponding to CMAKE_OSX_SYSROOT. Suggested-by: Sean McBride <sean@rogue-research.com>
* | | | | | | | | Merge topic 'wince-archfam'Brad King2013-09-261-4/+11
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0b15ffc MSVC: Fix WinCE arch family preprocessor symbol (#14436)
| * | | | | | | | | MSVC: Fix WinCE arch family preprocessor symbol (#14436)Patrick Gansterer2013-09-251-4/+11
| | |_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In commit bd827f98 (Use COFF file header header for architecture detection, 2013-08-05) the MSVC_<lang>_ARCHITECTURE_ID value computed by CMakeDetermineCompilerId.cmake changed for WinCE architectures to be the exact architecture read from the PE header. Fix platform preprocessor definitions in Modules/Platform/Windows-MSVC.cmake to correspond to the architecture family (ARM or SHx) instead of the specific architecture.
* | | | | | | | | VS: Use version-specific subsystem for WinCE compiler id (#14440)Patrick Gansterer2013-09-251-1/+5
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The subsystem must be set to WINDWOSCE for some SDKs to link an executable. Set it to 9 for VS2005 and to 8 for VS2008, since the value differs between the different Visual Studio versions.
* | | | | | | | MSVC: Fix version test for linking corelibc on Windows CE (#14420)Patrick Gansterer2013-09-231-1/+1
| |_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In commit 8fcf0ab0 (Add support for new Windows CE compiler, 2013-08-04) we made corelibc conditional on the MSVC version, but the version value was incorrect. Update it to use corelibc for VS 2008 and below.
* | | | | | | FindHDF5: Fix regression in per-configuration library selectionBrad King2013-09-191-36/+2
| |_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When FindHDF5 was first added in commit e6734068 (Add HDF5 find module..., 2009-08-24) it contained a workaround for a bug in SelectLibraryConfigurations that did not transform lists correctly. That bug was fixed by commit 5797512c (SelectLibraryConfiguration: generate correct output when input vars are lists, 2012-07-28). Then refactoring in commit 04d4dc33 (SelectLibraryConfigurations: Use -NOTFOUND instead of copying the vars, 2013-07-08) changed undocumented behavior on which the original workaround relied. The result puts entries like HDF5_hdf5_LIBRARY_DEBUG-NOTFOUND in HDF5_LIBRARIES. Fix this by dropping the original workaround since the underlying issue has been fixed anyway. Use the HDF5_${LIB}_LIBRARY selected by the call to select_library_configurations directly.
* | | | | | Merge topic 'FindPNG-compatibility'Brad King2013-09-171-5/+9
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | | | | | | | | | | | | 6816044 FindPNG: Honor old PNG_LIBRARY if provided (#14398)
| * | | | | FindPNG: Honor old PNG_LIBRARY if provided (#14398)Brad King2013-09-131-5/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In commit 2a797539 (FindPNG: improve library detection, 2013-07-27) we split the search for PNG into separate PNG_LIBRARY_DEBUG and PNG_LIBRARY_RELEASE variables. However, if a project or user sets the old PNG_LIBRARY value we must honor it instead of searching. While at it, mark PNG_LIBRARY_RELEASE and PNG_LIBRARY_DEBUG as advanced and remove a stray debug message.