summaryrefslogtreecommitdiffstats
path: root/Modules
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'document-missing-versions'David Cole2012-03-022-0/+4
|\ | | | | | | | | 95f5094 document when version detection will not work
| * document when version detection will not workRolf Eike Beer2012-02-292-0/+4
| |
* | Merge topic 'fix-FindPackageMode-symlink'David Cole2012-03-021-1/+2
|\ \ | | | | | | | | | | | | 0b86388 CMakeFindPackageMode: fix 32/64bit detection if 'file' is a symlink
| * | CMakeFindPackageMode: fix 32/64bit detection if 'file' is a symlinkYury G. Kudryashov2012-02-281-1/+2
| |/
* | Merge topic 'findpythoninterp-version-detection'David Cole2012-03-021-16/+35
|\ \ | | | | | | | | | | | | 7d6db93 FindPythonInterp: rework the version detection
| * | FindPythonInterp: rework the version detectionRolf Eike Beer2012-02-271-16/+35
| |/ | | | | | | | | | | | | | | | | There are versions out there that neither understand --version nor -V. Try a completely different approach: execute a small python script that prints the version number (and only that) in an easily reusable way using sys.version_info. This is documented to work since Python 2.0. Use sys.version for older versions, which is documented to exist since 1.5. If even that doesn't work then simply assume we are on 1.4.0.
* | Merge topic 'fix-findimagemagick-no-components'David Cole2012-03-021-1/+1
|\ \ | | | | | | | | | | | | 518f965 FindImageMagick: fix fail if no components were given
| * | FindImageMagick: fix fail if no components were givenRolf Eike Beer2012-02-271-1/+1
| |/ | | | | | | The variable name should be added to the list here, not the content.
* | Merge topic 'CPack-fixPackageMaker-doc'David Cole2012-03-021-12/+13
|\ \ | | | | | | | | | | | | | | | 2ace342 Typo: Add missing ##end for ##module c895062 Update CPack PackageMaker variable doc layout
| * | Typo: Add missing ##end for ##moduleEric NOULARD2012-02-251-0/+1
| | |
| * | Update CPack PackageMaker variable doc layoutEric NOULARD2012-02-251-12/+12
| |/
* | Merge topic 'CPack-cygwinGeneratorDoc'David Cole2012-03-021-0/+33
|\ \ | | | | | | | | | | | | 98d1583 Provide template for CPack Cygwin generator specific variables.
| * | Provide template for CPack Cygwin generator specific variables.Eric NOULARD2012-02-251-0/+33
| |/
* | Merge topic 'CPack-updateCommonDoc'David Cole2012-03-021-78/+106
|\ \ | | | | | | | | | | | | | | | 6ad0f04 Update CPackConfig template. 94a2693 Review and update CPack variable documentation.
| * | Review and update CPack variable documentation.Eric NOULARD2012-02-251-78/+106
| |/ | | | | | | | | | | | | This concerns all variables common to all CPack generators. Variables mainly used and/or set in CPack.cmake are documented therein. C++ built-in variables are documented in cmCPackDocumentVariables.cxx.
* | Merge topic 'CPack-fixCPackDMG-docLayout'David Cole2012-03-021-29/+29
|\ \ | | | | | | | | | | | | b3851f5 Fix CPack Drag and Drop generator documentation layout.
| * | Fix CPack Drag and Drop generator documentation layout.Eric NOULARD2012-02-251-29/+29
| |/
* | Merge topic 'CPack-fixCPackBundleDocLayout'David Cole2012-03-021-15/+14
|\ \ | | | | | | | | | | | | 4849e6a Fix layout of the CPack Bundle documentation
| * | Fix layout of the CPack Bundle documentationEric NOULARD2012-02-251-15/+14
| |/ | | | | | | | | CPACK_BUNDLE_STARTUP_SCRIPT was in fact CPACK_BUNDLE_STARTUP_COMMAND in the C++ code. The doc has been changed accordingly.
* | Merge topic 'fix-findhspell-version'David Cole2012-03-021-1/+4
|\ \ | | | | | | | | | | | | 213eb6e FindHSPELL: set HSPELL_VERSION_STRING
| * | FindHSPELL: set HSPELL_VERSION_STRINGRolf Eike Beer2012-02-251-1/+4
| |/ | | | | | | This variable was documented, but never set.
* | Merge topic 'improve-findopenscenegraph'David Cole2012-03-021-5/+5
|\ \ | | | | | | | | | | | | ffdaa47 FindOpenSceneGraph: give every message() with an explicit level
| * | FindOpenSceneGraph: give every message() with an explicit levelRolf Eike Beer2012-02-241-5/+5
| |/
* | Merge topic 'improve-generateexportheader'David Cole2012-03-021-35/+9
|\ \ | | | | | | | | | | | | | | | c28e276 GenerateExportHeader: improve compiler identification 4412fc0 GenerateExportHeader: remove unneeded code
| * | GenerateExportHeader: improve compiler identificationRolf Eike Beer2012-02-241-28/+9
| | | | | | | | | | | | | | | | | | Use CMAKE_<LANG>_COMPILER_VERSION instead of calling the compiler. This macro predates those useful variables. This also fixes the issue that g++ version detection was not working if C language was not enabled.
| * | GenerateExportHeader: remove unneeded codeRolf Eike Beer2012-02-241-7/+0
| |/ | | | | | | | | These expressions check for command line arguments unsupported by the compiler. We don't pass any custom flags here anyway so this isn't needed.
* | Merge topic 'icc-compiler-flags'David Cole2012-03-022-0/+2
|\ \ | | | | | | | | | | | | f6ecb90 Check{C,CXX}CompilerFlag: detect ICC error messages
| * | Check{C,CXX}CompilerFlag: detect ICC error messagesRolf Eike Beer2012-02-232-0/+2
| |/ | | | | | | Patch provided by Christopher Sean Morrison.
* | Merge topic 'improve-findpythonlibs'David Cole2012-03-022-8/+66
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | 53d02ea FindPythonLibs: stop scanning when libraries are found 91d5a2a FindPythonLibs: put debug libraries into PYTHON_LIBRARIES c9c1a17 FindPythonLibs: get the exact version of the found library (#3080) f772378 FindPythonLibs: make the version selection work as for PythonInterp bbddaee FindPython{Interp,Libs}: document Python_ADDITIONAL_VERSIONS as input
| * | FindPythonLibs: stop scanning when libraries are foundRolf Eike Beer2012-02-231-0/+4
| | |
| * | FindPythonLibs: put debug libraries into PYTHON_LIBRARIESRolf Eike Beer2012-02-231-3/+11
| | |
| * | FindPythonLibs: get the exact version of the found library (#3080)Rolf Eike Beer2012-02-221-2/+12
| | |
| * | FindPythonLibs: make the version selection work as for PythonInterpRolf Eike Beer2012-02-221-2/+33
| | |
| * | FindPython{Interp,Libs}: document Python_ADDITIONAL_VERSIONS as inputRolf Eike Beer2012-02-222-2/+7
| |/ | | | | | | | | The current documentation could be read as if that variable is output from the module, which is nonsense.
* | Merge topic 'cleanup-useswig'David Cole2012-03-021-8/+5
|\ \ | | | | | | | | | | | | aca1121 UseSWIG: clean up string compares
| * | UseSWIG: clean up string comparesRolf Eike Beer2012-02-231-8/+5
| |/
* | Merge topic 'simplify-findopenmp'David Cole2012-03-021-10/+2
|\ \ | | | | | | | | | | | | 0110262 FindOpenMP: simplify check for enabled languages
| * | FindOpenMP: simplify check for enabled languagesRolf Eike Beer2012-02-221-10/+2
| |/
* | Merge topic 'fix-generate_export_header-docs'David Cole2012-03-021-1/+1
|\ \ | | | | | | | | | | | | 40efa4d Fix documented function signature to match reality.
| * | Fix documented function signature to match reality.Stephen Kelly2012-02-211-1/+1
| |/ | | | | | | The function description is already correct.
* | Merge topic 'add-Embarcadero-support'David Cole2012-03-027-29/+53
|\ \ | |/ |/| | | | | | | bdbbf76 Recognize Embarcadero compiler (#12604) 3f78ced Rename Modules/Platform/Windows-{Borland => Embarcadero}.cmake
| * Recognize Embarcadero compiler (#12604)Brad King2012-02-207-26/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Borland compiler was re-branded as CodeGear during 2007-2009 and since 2009 is the Embarcadero compiler. They offer predefined macros: http://docwiki.embarcadero.com/RADStudio/en/Predefined_Macros and distinguish themselves by __CODEGEARC__ and __CODEGEARC_VERSION__. Version 6.30 (C++Builder XE) changed the meaning of some flags: http://docwiki.embarcadero.com/RADStudio/en/C%2B%2B_Compiler_Option_Changes_for_XE Teach Embarcadero compiler information files to generate build rules with flags matching the compiler version. Leave the flags unchanged for old Borland versions. Always set the BORLAND toolchain indicator for compatibility with existing projects that test it. Also set the EMBARCADERO indicator for newer toolchains.
| * Rename Modules/Platform/Windows-{Borland => Embarcadero}.cmakeBrad King2012-02-173-7/+7
| | | | | | | | | | | | | | The Borland compiler is now the Embarcadero compiler. Rename the shared platform information file to reflect this. This does not change the interface, as old versions are still "Borland", but will allow new versions released by Embarcadero to be supported cleanly.
* | Merge topic 'HandleTargetsInCMakeRequiredLibraries'David Cole2012-02-2112-33/+217
|\ \ | | | | | | | | | | | | | | | | | | | | | 35c48e1 Check*.cmake: Expand imported targets in CMAKE_REQUIRED_LIBRARIES 61cb4ea bootstrap: move while() and endwhile() into the bootstrap build c9f2886 -don't pull in CheckTypeSize.cmake from the cmake which is being built 628f365 -remove trailing whitespace
| * | Check*.cmake: Expand imported targets in CMAKE_REQUIRED_LIBRARIESAlex Neundorf2012-02-2112-11/+195
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add the function cmake_expand_imported_targets() to expand imported targets in a list of libraries into their on-disk file names for a particular configuration. Adapt the implementation from KDE's HANDLE_IMPORTED_TARGETS_IN_CMAKE_REQUIRED_LIBRARIES which has been in use for over 2 years. Call the function from all the Check*.cmake macros to handle imported targets named in CMAKE_REQUIRED_LIBRARIES. Alex
| * | -remove trailing whitespaceAlex Neundorf2012-02-216-22/+22
| | | | | | | | | | | | Alex
* | | Merge topic 'qt3-find-qtmain'David Cole2012-02-211-1/+4
|\ \ \ | | | | | | | | | | | | | | | | f506621 Fix paths/hints for finding qtmain.
| * | | Fix paths/hints for finding qtmain.Clinton Stimpson2012-02-201-1/+4
| | |/ | |/|
* | | Merge topic 'CPack-dynamicDocSection'David Cole2012-02-218-58/+206
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9a8103e Try to fix compile error on Win32-vs70 4da2223 Fix typo in end markup cfac874 More documentation concerning CPack Components dee0a38 Put CPack DMG and PackageMaker doc in separate files b4abcfe Correct copy/paste section name mistake 9717727 Suppress unecessary (now empty) doc sections 7a8f44a Add structure documentation for CPack Bundle generator b8a274c Add structured documentation for NSIS a6bce55 Dynamically add documentation section specified in documented script.
| * | | Fix typo in end markupEric NOULARD2012-02-181-1/+1
| | | |