summaryrefslogtreecommitdiffstats
path: root/Modules
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'qt4-deploy'David Cole2012-03-081-0/+6
|\ | | | | | | | | 2c601c1 DeployQt4: Add path to Qt dlls on Windows.
| * DeployQt4: Add path to Qt dlls on Windows.Clinton Stimpson2012-03-071-0/+6
| |
* | Merge topic 'MakingConfigFilesEasier_ConfigureMacro'David Cole2012-03-082-26/+190
|\ \ | | | | | | | | | | | | | | | 6973e2d wrap write_basic_config_version_file as write_basic_package_version_file() 204f5d4 add CMakePackageConfigHelpers: configure_package_config_file()
| * | wrap write_basic_config_version_file as write_basic_package_version_file()Alex Neundorf2012-03-072-29/+39
| | | | | | | | | | | | | | | | | | | | | So the name fits better with configure_package_config_file(), as discussed on the mailing list. Adapt the documentation accordingly. Alex
| * | add CMakePackageConfigHelpers: configure_package_config_file()Alex Neundorf2012-03-071-0/+154
| | | | | | | | | | | | | | | | | | | | | | | | The function configure_package_config_file() may be used instead of configure_file() for generating the Config.cmake files for installation, they help to make those files relocatable. Alex
* | | Merge topic 'CPackNSIS-addMissingDoc'David Cole2012-03-082-10/+23
|\ \ \ | |_|/ |/| | | | | | | | d4719a8 Add some missing CPACK_NSIS_xxx doc and move some to common CPack section.
| * | Add some missing CPACK_NSIS_xxx doc and move some to common CPack section.Eric NOULARD2012-03-062-10/+23
| | |
* | | Merge topic 'skip-install-rpath'David Cole2012-03-061-0/+3
|\ \ \ | | | | | | | | | | | | | | | | 635bf50 Add an option to skip RPATH during installation.
| * | | Add an option to skip RPATH during installation.Stephen Kelly2012-03-051-0/+3
| | |/ | |/|
* | | Merge topic 'improve-findqt3'David Cole2012-03-061-60/+31
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | | | | 678c24d FindQt3: fix detection of Qt3 include directory 91a1670 FindQt3: let FPHSA handle the version selection 9dae4d6 FindQt3: fix version extraction for versions with letters 2cd898d FindQt3: fix warning when Qt3 is not found
| * | FindQt3: fix detection of Qt3 include directoryRolf Eike Beer2012-03-021-2/+5
| | | | | | | | | | | | The include directory is likely not inside ../bin
| * | FindQt3: let FPHSA handle the version selectionRolf Eike Beer2012-03-021-54/+14
| | |
| * | FindQt3: fix version extraction for versions with lettersRolf Eike Beer2012-03-021-2/+2
| | |
| * | FindQt3: fix warning when Qt3 is not foundRolf Eike Beer2012-03-021-2/+10
| | | | | | | | | | | | | | | | | | -- Could NOT find Qt3 (missing: QT_QT_LIBRARY QT_INCLUDE_DIR QT_MOC_EXECUTABLE) CreateProcess failed QT_MOC_EXECUTABLE-NOTFOUND -v CreateProcess failed QT_UIC_EXECUTABLE-NOTFOUND -version
* | | Merge topic 'qt4-deploy'David Cole2012-03-061-31/+41
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4689eed reflect that the QtAutomoc depends on QtGui ab9661c Remove QtGui dependency in Qt4Deploy test and verify QtSql existance. 52e8279 Fix for Qt4Deploy on some test machines. 672e3bb Add test for DeployQt4.cmake 4853e1e Fix plugin installation issues. 35cbf23 Ensure libs are passed to BundleUtilities. 0ac1535 Fix bad plugin paths. a2123e8 Fix mismatched arguments. fc6f340 Don't use QT_LIBRARIES_PLUGINS by default.
| * | | Fix plugin installation issues.Mike McQuaid2012-02-231-13/+27
| | | |
| * | | Ensure libs are passed to BundleUtilities.Mike McQuaid2012-02-211-2/+2
| | | |
| * | | Fix bad plugin paths.Mike McQuaid2012-02-211-13/+13
| | | |
| * | | Fix mismatched arguments.Mike McQuaid2012-02-211-1/+1
| | | |
| * | | Don't use QT_LIBRARIES_PLUGINS by default.Mike McQuaid2012-02-211-4/+0
| | |/ | |/| | | | | | | | | | | | | A lot of the libraries won't be found by default so will spit out all sorts of errors. Don't kill QT_LIBRARIES_PLUGINS altogether as it is sometimes useful.
* | | 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
| | | |