summaryrefslogtreecommitdiff
path: root/Modules
Commit message (Collapse)AuthorAgeFilesLines
* Convert builtin help to reStructuredText source filesKitware Robot2013-10-15219-5865/+9684
| | | | | | | | Run the convert-help.bash script to convert documentation: ./convert-help.bash "/path/to/CMake-build/bin" Then remove it.
* Merge topic 'wix-extra-sources'Brad King2013-10-151-0/+14
|\ | | | | | | | | 2e6cadd CPackWiX: allow user supplied extra sources, objects and libraries
| * CPackWiX: allow user supplied extra sources, objects and librariesNils Gladitz2013-10-131-0/+14
| |
* | Merge topic 'FindCUDA-NPP-5.5'Brad King2013-10-151-1/+16
|\ \ | | | | | | | | | | | | 5076218 FindCUDA: Fix NPP library search for CUDA 5.5
| * | FindCUDA: Fix NPP library search for CUDA 5.5Vladislav Vinogradov2013-10-111-1/+16
| | | | | | | | | | | | In CUDA 5.5 NPP was divided onto 3 separate libraries: nppc, npps, nppi.
* | | OS X: Encode -F framework search flag in per-language platform variableBrad King2013-10-101-0/+5
| |/ |/| | | | | | | | | | | | | | | Compilers for languages other than C and C++ on OS X may not understand the -F framework search flag. Create a new platform information variable CMAKE_<LANG>_FRAMEWORK_SEARCH_FLAG to hold the flag, and set it for C and CXX lanugages in the Platform/Darwin module. Reported-by: Vittorio Giovara <vittorio.giovara@gmail.com>
* | Merge topic 'deprecation-message'Brad King2013-10-092-27/+3
|\ \ | | | | | | | | | | | | | | | | | | f973737 GenerateExportHeader: Port to use message(DEPRECATION) f69606d Qt4Macros: Port to use message(DEPRECATION) 509c142 message: Add a DEPRECATION mode
| * | GenerateExportHeader: Port to use message(DEPRECATION)Stephen Kelly2013-10-081-9/+1
| | |
| * | Qt4Macros: Port to use message(DEPRECATION)Stephen Kelly2013-10-081-18/+2
| | |
* | | Merge topic 'blas-windows'Brad King2013-10-092-57/+135
|\ \ \ | | | | | | | | | | | | | | | | | | | | 192a918 FindLAPACK: MKL clean up and fix for windows 46c7bca FindBLAS: Fixes for Windows MKL support
| * | | FindLAPACK: MKL clean up and fix for windowsLeszek Swirski2013-10-081-45/+49
| | | |
| * | | FindBLAS: Fixes for Windows MKL supportLeszek Swirski2013-10-081-12/+86
| | | |
* | | | Merge topic 'FindGTK2-targets'Brad King2013-10-091-98/+272
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7efef02 FindGTK2: Add tests for components and targets in gtk and gtkmm modules 95fc47a FindGTK2: Make pangocairo and cairo optional dependencies 26f790f FindGTK2: Change extra includes -> optional 24e0272 FindGTK2: do not skip target creation if optional dependencies are not found d5f130c FindGTK2: Refactor _GTK2_ADJUST_LIB_VARS into _GTK2_ADD_TARGET fffbd72 FindGTK2: Do not add freetype includes if they are not found b69720d FindGTK2: Add libraries to the GTK2_LIBRARIES variable only when found 425ec40 FindGTK2: Do not link libfreetype e9f46df FindGTK2: Add config directories only if different from include ones 56a79e1 FindGTK2: Set INTERFACE_COMPILE_DEFINITIONS target property only if not empty 4b47586 FindGTK2: Add check to ensure that target exists 61242cc FindGTK2: Fix gmodule, glibmm, pangoft2, and pangoxft targets 4b876de FindGTK2: Link freetype libs to targets including freetype includes 67e761f FindGTK2: Small cleanup 682eea3 FindGTK2: Do not require the GTK_ prefix in all the internal functions 0bc3763 FindGTK2: Better handling of include directories ...
| * | | | FindGTK2: Make pangocairo and cairo optional dependenciesDaniele E. Domenichelli2013-10-081-12/+14
| | | | |
| * | | | FindGTK2: Change extra includes -> optionalDaniele E. Domenichelli2013-10-081-24/+18
| | | | | | | | | | | | | | | | | | | | On some versions they are not required.
| * | | | FindGTK2: do not skip target creation if optional dependencies are not foundDaniele E. Domenichelli2013-10-081-7/+12
| | | | | | | | | | | | | | | | | | | | On some older GTK2 version gio, giomm and cairomm are not available
| * | | | FindGTK2: Refactor _GTK2_ADJUST_LIB_VARS into _GTK2_ADD_TARGETDaniele E. Domenichelli2013-10-081-152/+161
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This function avoids creating the targets when the required dependencies were not found. Also fix some wrong dependency and some typo. ${FREETYPE_INCLUDE_DIR_ft2build} ${FREETYPE_INCLUDE_DIR_freetype2} are now required for gtkmm component
| * | | | FindGTK2: Do not add freetype includes if they are not foundDaniele E. Domenichelli2013-10-081-2/+6
| | | | | | | | | | | | | | | | | | | | On some older system they are not required
| * | | | FindGTK2: Add libraries to the GTK2_LIBRARIES variable only when foundDaniele E. Domenichelli2013-10-081-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some libraries (e.g. gio) are not necessary, and often not available with older GTK2 versions, therefore GTK_LIBRARIES should not contain GTK2_XXX-NOT_FOUND for these libraries.
| * | | | FindGTK2: Do not link libfreetypeDaniele E. Domenichelli2013-10-081-34/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As discussed on the mailing list, freetype includes used in GTK2 headers libraries do not require to link the library explicitly (even though it is already linked by GTK2 libraries. Also remove _GTK2_ADD_TARGET_LIBRARIES no longer used and use ${FREETYPE_INCLUDE_DIR_ft2build} ${FREETYPE_INCLUDE_DIR_freetype2} variables instead of ${FREETYPE_INCLUDE_DIRS}
| * | | | FindGTK2: Add config directories only if different from include onesDaniele E. Domenichelli2013-10-081-1/+1
| | | | |
| * | | | FindGTK2: Set INTERFACE_COMPILE_DEFINITIONS target property only if not emptyDaniele E. Domenichelli2013-10-081-1/+3
| | | | |
| * | | | FindGTK2: Add check to ensure that target existsDaniele E. Domenichelli2013-10-081-5/+7
| | | | |
| * | | | FindGTK2: Fix gmodule, glibmm, pangoft2, and pangoxft targetsDaniele E. Domenichelli2013-10-081-3/+8
| | | | |
| * | | | FindGTK2: Link freetype libs to targets including freetype includesDaniele E. Domenichelli2013-10-081-0/+21
| | | | |
| * | | | FindGTK2: Small cleanupDaniele E. Domenichelli2013-10-071-1/+0
| | | | |
| * | | | FindGTK2: Do not require the GTK_ prefix in all the internal functionsDaniele E. Domenichelli2013-10-071-146/+148
| | | | | | | | | | | | | | | | | | | | This saves from using string(REGEXP) to create targets
| * | | | FindGTK2: Better handling of include directoriesDaniele E. Domenichelli2013-10-071-13/+15
| | | | | | | | | | | | | | | | | | | | Add a method _GTK2_ADD_TARGET_INCLUDE_DIRS to handle it.
| * | | | FindGTK2: Create targets for each libraryDaniele E. Domenichelli2013-10-071-3/+147
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Methods: * _GTK2_ADJUST_LIB_VARS * _GTK2_ADD_TARGET_DEPENDS_INTERNAL * _GTK2_ADD_TARGET_DEPENDS are strongly inspired by FindQt4.cmake
| * | | | FindGTK2: Search for glib-object.h instead of gobject/gobject.hDaniele E. Domenichelli2013-10-071-1/+1
| | | | | | | | | | | | | | | | | | | | This is the topmost include file for GObject header files
| * | | | FindGTK2: Populate GTK2_DEFINITIONS before searching for librariesDaniele E. Domenichelli2013-10-071-14/+14
| | | | |
| * | | | FindGTK2: Export GTK2_XXX_FOUND to parent scope in _GTK2_FIND_LIBRARYDaniele E. Domenichelli2013-10-071-0/+3
| | | | | | | | | | | | | | | | | | | | Also add a debug message to report if the library was found or not
* | | | | Merge topic 'FindSDL-path-suffixes'Brad King2013-10-091-1/+3
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | c5c217c FindSDL: Add path suffixes for <prefix>/include/(SDL|SDL12|SDL11)
| * | | | | FindSDL: Add path suffixes for <prefix>/include/(SDL|SDL12|SDL11)Brad King2013-10-081-1/+3
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also add a comment explaining the purpose of the include/SDL* path suffixes. As explained in commit 7cb51739 (FindSDL: Restore accidentally dropped search paths (#13651), 2012-11-05) the include/SDL* path suffixes are for looking in the ENV{SDLDIR} location. Inspired-by: Adrien Destugues <pulkomandy@pulkomandy.tk>
* | | | | Merge topic 'haiku-updates'Brad King2013-10-092-14/+115
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 54ef2be Haiku: Include files cleanup in cmCTest 38d5555 Haiku: Remove outdated preprocessor checks 1dc61f8 Haiku: Remove use of B_COMMON_DIRECTORY 7ebc1cb Haiku: Several fixes to platform module
| * | | | | Haiku: Several fixes to platform moduleAdrien Destugues2013-10-082-14/+115
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Do not define BEOS anymore (this includes workarounds which we don't need most of the time in Haiku, so we prefer opt-in IF(HAIKU) in the cmake files instead). * On the other hand, do define UNIX (we are trying to be compliant) and HAIKU (there is still a number of things we don't do like the average UNIX clone) * Do not use UnixPaths, as our filesystem hierarchy isn't anything like what it expects. * Do not use -nostart, which the compiler doesn't know about anymore. This used to be an Haiku extension to gcc, and is equivalent to -shared which is the default gcc option. * While "dl" functions are provided in libroot, this is always implicitly linked so there is no need to tell cmake about it. * Forcing position-independent code is not needed, so remove it. * On the other hand, include appropriate linker options for executables and shared libraries. * Support for the two available compilers in Haiku (gcc2 and gcc4) and pick the right headers and libraries according to the currently selected one. * With the adoption of the package manager, the directory layout was changed. Tell cmake where to look for header files and libraries. * As we don't define BEOS anymore, enable the workaround we still need for HAIKU as well. This is the lack of a libm (it is part of the implicitly linked in libroot) Applied-by: Rolf Eike Beer <eike@sf-mail.de>
* | | | | | 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-077-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-071-0/+2
| | | |
| * | | FindGTK2: Find freetype quietlyDaniele E. Domenichelli2013-10-071-1/+1
| | | |
| * | | FindGTK2: Mark GTK_*_INCLUDE_DIR as advancedDaniele E. Domenichelli2013-10-071-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>
View Lorry Controller Status