summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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-01-301-1/+1
|
* KWSys Nightly Date StampKWSys Robot2012-01-291-1/+1
|
* KWSys Nightly Date StampKWSys Robot2012-01-281-1/+1
|
* KWSys Nightly Date StampKWSys Robot2012-01-271-1/+1
|
* KWSys Nightly Date StampKWSys Robot2012-01-261-1/+1
|
* Merge topic 'improve-findbzip2'David Cole2012-01-251-6/+20
|\ | | | | | | | | | | 5b6ca9f FindBZip2: add support for debug libraries (#12867) 40fb005 FindBZip2: add support for version checking
| * FindBZip2: add support for debug libraries (#12867)Rolf Eike Beer2012-01-241-5/+11
| | | | | | | | | | | | | | The debug library has a different name on Windows. Make sure both versions work. Thanks to Patrick Spendrin for testing this.
| * FindBZip2: add support for version checkingRolf Eike Beer2012-01-241-1/+9
| |
* | Merge topic 'improve-findjasper'David Cole2012-01-251-7/+23
|\ \ | | | | | | | | | | | | | | | a580a23 FindJasper: support version number 9bf7c4e FindJasper: find debug libraries
| * | FindJasper: support version numberRolf Eike Beer2012-01-241-2/+12
| | |
| * | FindJasper: find debug librariesRolf Eike Beer2012-01-241-6/+12
| | |
* | | Merge topic 'flex-version'David Cole2012-01-251-1/+5
|\ \ \ | | | | | | | | | | | | | | | | | | | | 0b2e81c FindFLEX: fix version parsing when the executable is quoted 2cf5df3 FindFLEX: fix version parsing for old flex versions
| * | | FindFLEX: fix version parsing when the executable is quotedRolf Eike Beer2012-01-231-1/+1
| | | |
| * | | FindFLEX: fix version parsing for old flex versionsRolf Eike Beer2012-01-201-1/+5
| | | |
* | | | Merge topic 'improve-findcurl'David Cole2012-01-251-4/+15
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | c1b8849 FindCURL: support version selection
| * | | | FindCURL: support version selectionRolf Eike Beer2012-01-231-4/+15
| | | | |
* | | | | Merge topic 'improve-findexpat'David Cole2012-01-251-1/+23
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 7f81c48 FindEXPAT: support version number
| * | | | | FindEXPAT: support version numberRolf Eike Beer2012-01-231-1/+23
| |/ / / /
* | | | | Merge topic 'improve-findcups'David Cole2012-01-251-26/+39
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | be2b108 FindCups: major overhaul
| * | | | | FindCups: major overhaulRolf Eike Beer2012-01-231-26/+39
| |/ / / / | | | | | | | | | | | | | | | | | | | | This introduces CUPS_VERSION_STRING and ports the module over to use FPHSA for all the benefits that come with it.
* | | | | Merge topic 'improve-findgit'David Cole2012-01-251-1/+16
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | a803a62 FindGit: support version number
| * | | | | FindGit: support version numberRolf Eike Beer2012-01-231-1/+16
| |/ / / /
* | | | | Merge topic 'improve-findgnutls'David Cole2012-01-251-1/+4
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | b5719fb FindGnuTLS: partly support version selection
| * | | | | FindGnuTLS: partly support version selectionRolf Eike Beer2012-01-231-1/+4
| |/ / / / | | | | | | | | | | | | | | | | | | | | For the Un*x systems where we use PkgConfig to find the library we can also use the version returned from there.
* | | | | Merge topic 'improve-libxml2'David Cole2012-01-251-2/+8
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | a5fd391 FindLibXml2: support version selection
| * | | | | FindLibXml2: support version selectionRolf Eike Beer2012-01-231-2/+8
| |/ / / /
* | | | | Merge topic 'use-pkgconfig-quiet'David Cole2012-01-254-9/+7
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | ede3ec5 use pkg_check_modules() quiet in other modules
| * | | | | use pkg_check_modules() quiet in other modulesRolf Eike Beer2012-01-234-9/+7
| |/ / / / | | | | | | | | | | | | | | | | | | | | Those modules will already print what they found or not using FPHSA, no need to do this twice.
* | | | | Merge topic 'emacs-mode-indent-issue-12908'David Cole2012-01-251-0/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 7da35e6 cmake-mode.el: Indent after multiline argument (#12908)
| * | | | | cmake-mode.el: Indent after multiline argument (#12908)Brad King2012-01-231-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | After a multiline argument ending in a non-empty line e.g. if(TEST) set(VAR " ...") unset(VAR) endif() we previously failed to indent following lines like the "unset". Use cmake-line-starts-inside-string to keep walking back through multiline arguments until we find an indented line. Suggested-by: Christopher Sean Morrison <brlcad@mac.com>
* | | | | | Merge topic 'uninitialized-var-in-if'David Cole2012-01-253-0/+11
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 54fd9e3 fix uninitialized var in if(NOT foo bar STREQUAL "foo bar")
| * | | | | | fix uninitialized var in if(NOT foo bar STREQUAL "foo bar")Rolf Eike Beer2012-01-223-0/+11
| | |_|/ / / | |/| | | | | | | | | | | | | | | | Also adds test to verify this.
* | | | | | Merge topic 'find-threads-11333'David Cole2012-01-251-19/+28
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3dc6f2b FindThreads: Try pthreads with no special option first (#11333)
| * | | | | | FindThreads: Try pthreads with no special option first (#11333)Rolf Eike Beer2012-01-211-19/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QNX has the phtread stuff in the standard library. The best way would IMHO be to check if a program that uses pthread_* can be successfully linked without specifying any linker option before trying out the different flags.
* | | | | | | Merge topic 'GetPrerequisites-rpath-OSX'David Cole2012-01-253-0/+111
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 98d2031 Fix BundleUtilities test failure with space in build path. 36d6641 Fix new BundleUtilities test failure on Mac 10.4.x 0d96dec GetPrerequisites: Add test for @rpath support. 880139a GetPrerequisites: Add support for @rpath on Mac OS X. 9a6b102 GetPrerequisites: Add support for @rpath on Mac OS X.
| * | | | | | | Fix BundleUtilities test failure with space in build path.Clinton Stimpson2012-01-211-2/+2
| | | | | | | |
| * | | | | | | Fix new BundleUtilities test failure on Mac 10.4.xClinton Stimpson2012-01-201-1/+1
| | | | | | | |
| * | | | | | | GetPrerequisites: Add test for @rpath support.Clinton Stimpson2012-01-202-0/+82
| | | | | | | |
| * | | | | | | GetPrerequisites: Add support for @rpath on Mac OS X.Clinton Stimpson2012-01-201-6/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change to consider a library embedded if it is found in a subdirectory relative to the using executable/library. Previous commit considered them local. This case is encountered when @rpath is used with framework libraries, which are inside a directory tree.
| * | | | | | | GetPrerequisites: Add support for @rpath on Mac OS X.Clinton Stimpson2011-11-211-3/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Handle @rpath much like other Unixes, by doing a find_file with the given directories. Also, consider a library to be local if it is found in the same directory or a subdirectory relative to the user executable/library. Previously, it was local only if found in the same directory. This case is encountered when @rpath is used with framework libraries, which are inside a directory tree.
* | | | | | | | Merge topic 'loadcommand-test-cleanup'David Cole2012-01-253-15/+0
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1531c11 LoadCommand test: cleanup
| * | | | | | | | LoadCommand test: cleanupRolf Eike Beer2012-01-203-15/+0
| | |_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This removes some useless checking. The results of these things are never properly checked so they should not count as testcases. At the end they only needlessly clutter the output.
* | | | | | | | Merge topic 'FPHSA-CONFIG_MODE-doc'David Cole2012-01-251-3/+3
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 26015ba FindPackageHandleStandardArgs: fix documentation
| * | | | | | | | FindPackageHandleStandardArgs: fix documentationYury G. Kudryashov2012-01-201-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | State explicitly what CONFIG_MODE argument does.
* | | | | | | | | Merge topic 'FindPkgConfig-REQUIRED-issue-12620'David Cole2012-01-251-4/+2
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 55c3435 FindPkgConfig: respect REQUIRED (#12620)
| * | | | | | | | | FindPkgConfig: respect REQUIRED (#12620)Yury G. Kudryashov2012-01-201-4/+2
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | find_package(PkgConfig REQUIRED) now fails if pkg-config is not found.
* | | | | | | | | Merge topic 'python-version'David Cole2012-01-251-7/+48
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | aa11536 FindPythonInterp: fix version parsing 0fe4d69 FindPythonInterp: make version selectable
| * | | | | | | | | FindPythonInterp: fix version parsingRolf Eike Beer2012-01-191-5/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On dashmacmini2 the test showed output like this: -- Found PythonInterp: /usr/bin/python (found version "Unknown option: -- usage: /usr/bin/python [option] ... [-c cmd | file | -] [arg] ... Try `python -h' for more information.") On my machine where python outputs "Python 2.7" this worked, but PYTHON_VERSION_MAJOR, PYTHON_VERSION_MINOR, and PYTHON_VERSION_PATCH were all set to "2.7". Add some checks that the version output has the expected form before using it.
| * | | | | | | | | FindPythonInterp: make version selectableRolf Eike Beer2012-01-181-2/+39
| | |_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows the developer to tell FindPythonInterp which Python version should be searched for. This allows the right version to be chosen for a project without user assistance if there are specific requirements. This is especially useful as it is common to have major versions 2 and 3 installed in parallel, which are partly incompatible.