summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'improve-libarchive'David Cole2012-02-071-2/+3
|\ | | | | | | | | 9e25b12 FindLibArchive: support version selection
| * FindLibArchive: support version selectionRolf Eike Beer2012-02-011-2/+3
| |
* | Merge topic 'perl-version'David Cole2012-02-072-27/+48
|\ \ | | | | | | | | | | | | 31826b5 FindPerl{,Libs}: move version detection into FindPerl
| * | FindPerl{,Libs}: move version detection into FindPerlRolf Eike Beer2012-02-012-27/+48
| | | | | | | | | | | | | | | If the first attempt of getting the version doesn't succeed, try a second approach.
* | | Merge topic 'check_include_files_output'David Cole2012-02-071-5/+5
|\ \ \ | | | | | | | | | | | | | | | | 44d007b CheckIncludeFiles: fix status output
| * | | CheckIncludeFiles: fix status outputRolf Eike Beer2012-02-011-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CHECK_INCLUDE_FILES("foo.h" HAVE_FOO_H) gave an output like: Looking for include files HAVE_FOO_H After this change it does now what CHECK_INCLUDE_FILE() also does: Looking for include files foo.h
* | | | Merge topic 'AllFindModules-test'David Cole2012-02-071-11/+40
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ed1b126 CMakeOnly.AllFindModules: require version for some modules 2dee929 CMakeOnly.AllFindModules: suppress two modules from testing 3c4b4ff CMakeOnly.AllFindModules: always check FindQt 9d72b25 CMakeOnly.AllFindModules: clean up the Qt3/Qt4 code
| * | | | CMakeOnly.AllFindModules: require version for some modulesRolf Eike Beer2012-02-011-0/+22
| | | | |
| * | | | CMakeOnly.AllFindModules: suppress two modules from testingRolf Eike Beer2012-01-261-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | FindPackageHandleStandardArgs and FindPackageMessage match the glob expression but are nothing that will usually be fed into find_package().
| * | | | CMakeOnly.AllFindModules: always check FindQtRolf Eike Beer2012-01-261-2/+4
| | | | |
| * | | | CMakeOnly.AllFindModules: clean up the Qt3/Qt4 codeRolf Eike Beer2012-01-261-11/+11
| | | | |
* | | | | Merge topic 'find-vcexpress'David Cole2012-02-071-8/+15
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | de28946 Find VC Express during default generator selection (#12917)
| * | | | | Find VC Express during default generator selection (#12917)Peter Kuemmel2012-02-011-8/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CMake doesn't find Visual C++ Express and uses "NMake Makefiles" generator by default when one calls cmake WITHOUT using the -G options. Teach CMake to find VC Express to use it as the default generator just like the commercial versions.
* | | | | | Merge topic 'nsis-user-perm-issue-12923'David Cole2012-02-071-2/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | c4a0bce CPack: Fix NSIS handling of privileged users (#12923)
| * | | | | | CPack: Fix NSIS handling of privileged users (#12923)Mattias Helsing2012-02-011-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When using the NSIS generator from CPack the file NSIS.template.in is used to generate a project.nsi file for NSIS to process. The file consists code in the NSIS scripting language. Among other functions there is an onInit function the initializes the installer. The function (tries to) recognise admin and power users but fails since NSIS scripting language relative includes the jump from the current command so +3 means "run the third command after this one", so a failed check for admin completely skips the check for a power user and goes directly to "done:". User permission lookup was added in initial NSIS support by commit a11b9a4c (Merge from CPack branch, 2006-01-01). Later commit b1b052fd (Several changes to for NSIS, 2006-03-01) added a line inside a block that should be skipped by a jump without updating the jump length. Update the jump length to correct the behavior.
* | | | | | | KWSys Nightly Date StampKWSys Robot2012-02-071-1/+1
| | | | | | |
* | | | | | | KWSys Nightly Date StampKWSys Robot2012-02-061-1/+1
| | | | | | |
* | | | | | | KWSys Nightly Date StampKWSys Robot2012-02-051-1/+1
| | | | | | |
* | | | | | | KWSys Nightly Date StampKWSys Robot2012-02-041-1/+1
| | | | | | |
* | | | | | | KWSys Nightly Date StampKWSys Robot2012-02-031-1/+1
| | | | | | |
* | | | | | | KWSys Nightly Date StampKWSys Robot2012-02-021-1/+1
| |_|_|_|_|/ |/| | | | |
* | | | | | Merge topic 'update-nightly-cmake-qt-version-again'David Cole2012-02-011-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | a94ef02 Update dashmacmini2 release script to use Qt 4.8.0
| * | | | | | Update dashmacmini2 release script to use Qt 4.8.0David Cole2012-01-311-1/+1
| | | | | | |
* | | | | | | Merge topic 'rpath-docs-whitespace'David Cole2012-02-011-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 33eee2c Add whitespace after '.' in CMAKE_SKIP_RPATH docs.
| * | | | | | | Add whitespace after '.' in CMAKE_SKIP_RPATH docs.Stephen Kelly2012-01-311-1/+1
| | |/ / / / / | |/| | | | |
* | | | | | | Merge topic 'check_cxx_compiler_flag_cmakeonly'David Cole2012-02-013-18/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8de3b3d CheckCXXCompilerFlag test: make it a CMakeOnly test
| * | | | | | | CheckCXXCompilerFlag test: make it a CMakeOnly testRolf Eike Beer2012-01-303-18/+2
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge topic 'improve-findgettext'David Cole2012-02-011-1/+15
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 77e6c6f FindGettext: support version selection
| * | | | | | | FindGettext: support version selectionRolf Eike Beer2012-01-251-1/+15
| | | | | | | |
* | | | | | | | Merge topic 'Findosg_qt_and_presentation'David Cole2012-02-012-0/+104
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c040054 Findosg: New modules for osgQt and osgPresentation
| * | | | | | | | Findosg: New modules for osgQt and osgPresentationPhilip Lowman2012-01-282-0/+104
| | |_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added new find modules for osgQt and osgPresentation submitted by Robert Osfield <robert.osfield@gmail.com>
* | | | | | | | Merge topic 'improve-findalsa'David Cole2012-02-011-1/+11
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1de14ec FindALSA: support version selection
| * | | | | | | | FindALSA: support version selectionRolf Eike Beer2012-01-281-1/+11
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge topic 'improve-findgnuplot'David Cole2012-02-011-1/+15
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8a83853 FindGnuplot: add version selection
| * | | | | | | | FindGnuplot: add version selectionRolf Eike Beer2012-01-281-1/+15
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | Merge topic 'fix-jasper-debug'David Cole2012-02-011-1/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 00e30a0 FindJasper: fix library name
| * | | | | | | | FindJasper: fix library nameRolf Eike Beer2012-01-271-1/+1
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | Spotted by Patrick Spendrin.
* | | | | | | | Merge topic 'more-python-version'David Cole2012-02-011-2/+15
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bde7b5a FindPythonInterp: try harder to get a version number
| * | | | | | | | FindPythonInterp: try harder to get a version numberRolf Eike Beer2012-01-271-2/+15
| |/ / / / / / /
* | | | | | | | Merge topic 'more-bison-version'David Cole2012-02-011-2/+3
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3cc11c2 FindBISON: add a version expression for GNU Bison 1.x
| * | | | | | | | FindBISON: add a version expression for GNU Bison 1.xRolf Eike Beer2012-01-271-2/+3
| | |_|_|_|/ / / | |/| | | | | |
* | | | | | | | Merge topic 'fix-openssl-version'David Cole2012-02-011-4/+36
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0bee3d9 FindOpenSSL: properly parse the hex version components
| * | | | | | | | FindOpenSSL: properly parse the hex version componentsRolf Eike Beer2012-01-271-4/+36
| |/ / / / / / /
* | | | | | | | Merge topic 'imported-target-visibility'David Cole2012-02-0113-13/+81
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f9c1c62 Add test covering imported target scope rules ca39c5c Optionally allow IMPORTED targets to be globally visible
| * | | | | | | | Add test covering imported target scope rulesBrad King2012-01-255-0/+36
| | | | | | | | |
| * | | | | | | | Optionally allow IMPORTED targets to be globally visibleBrad King2012-01-258-13/+45
| | |_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Consider the case motivating commit e01cce28 (Allow add_dependencies() on imported targets, 2010-11-19). An imported target references a file generated at build time by a custom target on which it depends. Had the file been built directly using add_library or add_executable its target name would have been visible globally. Therefore the imported target representing the file should be globally visible also. Teach the IMPORTED signature of add_(executable|library) to accept a new "GLOBAL" option to make the imported target visible globally.
* | | | | | | | Merge topic 'improve-findpostgresql'David Cole2012-02-011-16/+16
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8e8db31 FindPostgreSQL: support version selection
| * | | | | | | | FindPostgreSQL: support version selectionRolf Eike Beer2012-01-261-16/+16
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | Merge topic 'improve-libxml2'David Cole2012-02-011-5/+12
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9d7a001 FindLibXml2: detect version when PkgConfig is not used
| * | | | | | | | FindLibXml2: detect version when PkgConfig is not usedRolf Eike Beer2012-01-261-5/+12
| |/ / / / / / /