summaryrefslogtreecommitdiffstats
path: root/Modules
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'vs-intel-compiler'Brad King2013-10-1811-99/+103
|\ | | | | | | | | | | | | | | | | | | d14898b Intel: Fix detection of MSVC version simulated by pre-11.0 Fortran a85e17e Intel: When simulating MSVC, re-use Windows-MSVC (#14476) af40e8c VS: Detect Intel Fortran compiler id and version b8522a8 VS: Expose Intel Fortran .vfproj format version to CMake language 2d36c9a CMakeDetermineCompilerId: Fix Intel Fortran compiler id detection a6fd17c VS: Fix CMAKE_<LANG>_COMPILER detection with Intel toolset (#14471)
| * Intel: Fix detection of MSVC version simulated by pre-11.0 FortranBrad King2013-10-181-3/+1
| | | | | | | | | | | | | | The Intel Fortran 10 64-bit compiler incorrectly defines _MSC_VER to its own version (1020) instead of the underlying MSVC tools version. Since we expect the compiler to be used only with VS >= 7 tools, assume MSVC version 13.0 if _MSC_VER is not greater than 1300.
| * Intel: When simulating MSVC, re-use Windows-MSVC (#14476)Brad King2013-10-188-93/+51
| | | | | | | | | | | | | | | | | | Teach CMake(C|CXX|Fortran)CompilerId* to report the MSVC version simulated by the Intel compiler, if any. Refactor the Windows-Intel platform information helper module to load Windows-MSVC instead of duplicating the information. Teach Windows-MSVC to understand when it is loaded as the simulated Fortran compiler (its preprocessor is simulated).
| * VS: Detect Intel Fortran compiler id and versionBrad King2013-10-183-5/+47
| | | | | | | | | | | | Teach CMakeDetermineCompilerId to use a .vfproj project file to build the Fortran compiler id source file under the Visual Studio generators.
| * CMakeDetermineCompilerId: Fix Intel Fortran compiler id detectionBrad King2013-10-161-1/+4
| | | | | | | | | | | | | | | | | | The Intel Fortran compiler needs the /fpp option to enable C preprocessing. Without the option the compiler may warn and ignore preprocessor lines instead of failing with an error. Detect the warning and treat it as failure so that we move on to try /fpp and detect the correct id. Without this it works only by luck because Intel is the first compiler id in our detection source file.
| * VS: Fix CMAKE_<LANG>_COMPILER detection with Intel toolset (#14471)Brad King2013-10-161-0/+3
| | | | | | | | | | When the platform toolset is from Intel, look for "icl.exe" instead of "cl.exe".
* | Merge topic 'wix-documentation-escapes'Brad King2013-10-171-2/+2
|\ \ | | | | | | | | | | | | 42b4f6c CPackWiX: prevent attribute references in docs from being interpreted
| * | CPackWiX: prevent attribute references in docs from being interpretedNils Gladitz2013-10-161-2/+2
| |/
* | Qt4: make pro files generated for translations easier to readRolf Eike Beer2013-10-161-3/+4
|/ | | | | -use one line for each input file and include directory -remove duplicate include directories
* Modules/readme.txt: Update steps to add module documentationBrad King2013-10-161-23/+41
| | | | | Replace the old module documentation instructions with steps to add reStructuredText documentation that will be built by Sphinx.
* CPack: Replace #<type> markup with reStructuredText equivalentKitware Robot2013-10-1611-1188/+805
| | | | | | | Drop #end and #module. Convert #section to a subsection header. Convert #variable to the cmake domain "variable" directive. Convert #macro to the cmake domain "command" directive. Perform minor formatting fixes in text near these changes.
* Help: Fix reStructuredText syntax in auto-generated documentsBrad King2013-10-153-4/+1
|
* ExternalProject: Restore documentation indentation levelBrad King2013-10-151-70/+70
| | | | | This module parses its own documentation to extract supported options. Fix the indentation level to match that expected by the parser.
* 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-081-1/+0
| | | | |
| * | | | FindGTK2: Do not require the GTK_ prefix in all the internal functionsDaniele E. Domenichelli2013-10-081-146/+148
| | | | | | | | | | | | | | | | | | | | This saves from using string(REGEXP) to create targets
| * | | | FindGTK2: Better handling of include directoriesDaniele E. Domenichelli2013-10-081-13/+15
| | | | | | | | | | | | | | | | | | | | Add a method _GTK2_ADD_TARGET_INCLUDE_DIRS to handle it.
| * | | | FindGTK2: Create targets for each libraryDaniele E. Domenichelli2013-10-081-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-081-1/+1
| | | | | | | | | | | | | | | | | | | | This is the topmost include file for GObject header files
| * | | | FindGTK2: Populate GTK2_DEFINITIONS before searching for librariesDaniele E. Domenichelli2013-10-081-14/+14
| | | | |
| * | | | FindGTK2: Export GTK2_XXX_FOUND to parent scope in _GTK2_FIND_LIBRARYDaniele E. Domenichelli2013-10-081-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
generated by cgit v0.12 at 2024-11-15 01:52:13 (GMT)