kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
17,975 Commits 1 Branch 14 Tags 53 MiB
Commit Graph

3458 Commits

Author SHA1 Message Date
David Cole 6c7a622279 Merge topic 'nsis-user-perm-issue-12923' 
c4a0bce CPack: Fix NSIS handling of privileged users (#12923)
 2012-02-07 15:33:01 -05:00
David Cole 0a11d33066 Merge topic 'improve-findgettext' 
77e6c6f FindGettext: support version selection
 2012-02-01 14:51:27 -05:00
David Cole cf4c0f335d Merge topic 'Findosg_qt_and_presentation' 
c040054 Findosg: New modules for osgQt and osgPresentation
 2012-02-01 14:51:17 -05:00
David Cole 19d437f2ca Merge topic 'improve-findalsa' 
1de14ec FindALSA: support version selection
 2012-02-01 14:50:57 -05:00
David Cole e3abd669a2 Merge topic 'improve-findgnuplot' 
8a83853 FindGnuplot: add version selection
 2012-02-01 14:50:34 -05:00
David Cole 28088aa045 Merge topic 'fix-jasper-debug' 
00e30a0 FindJasper: fix library name
 2012-02-01 14:50:21 -05:00
David Cole 29cddc60cd Merge topic 'more-python-version' 
bde7b5a FindPythonInterp: try harder to get a version number
 2012-02-01 14:50:03 -05:00
David Cole 79b7fe9d5e Merge topic 'more-bison-version' 
3cc11c2 FindBISON: add a version expression for GNU Bison 1.x
 2012-02-01 14:49:39 -05:00
David Cole a3982c15e4 Merge topic 'fix-openssl-version' 
0bee3d9 FindOpenSSL: properly parse the hex version components
 2012-02-01 14:49:21 -05:00
David Cole 94af99d388 Merge topic 'improve-findpostgresql' 
8e8db31 FindPostgreSQL: support version selection
 2012-02-01 14:49:00 -05:00
David Cole 9603ee9115 Merge topic 'improve-libxml2' 
9d7a001 FindLibXml2: detect version when PkgConfig is not used
 2012-02-01 14:48:47 -05:00
David Cole ba96356434 Merge topic 'improve-findcurl' 
0640ec9 FindCURL: detect version number also for older versions
 2012-02-01 14:48:31 -05:00
David Cole 3f7cea092b Merge topic 'improve-findtiff' 
815a6a2 FindTIFF: support version selection
 2012-02-01 14:47:57 -05:00
David Cole fa6816bd71 Merge topic 'improve-findlua51' 
49b69ad FindLua51: add version support
 2012-02-01 14:47:15 -05:00
David Cole c8d102eb40 Merge topic 'improve-selectlibraryconfigurations' 
1eaf1c9 SelectLibraryConfigurations: do not output identical configurations
 2012-02-01 14:46:54 -05:00
David Cole a98f99a820 Merge topic 'improve-findtclsh' 
e01fe58 FindTclsh: support version selection
 2012-02-01 14:46:23 -05:00
David Cole b7fd024229 Merge topic 'findruby-no-dummy-version' 
409aeaf FindRuby: do not blindly set version to 1.8.0
 2012-02-01 14:46:15 -05:00
David Cole bbc7259f70 Merge topic 'improve-findpng' 
0051506 FindPNG: support version selection
 2012-02-01 14:45:55 -05:00
David Cole aa8aed83f2 Merge topic 'improve-findimagemagick' 
1562b9c FindImageMagick: make use of more FPHSA features
 2012-02-01 14:45:26 -05:00
Mattias Helsing c4a0bcea77 CPack: Fix NSIS handling of privileged users (#12923) 
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.
 2012-02-01 08:18:49 -05:00
Philip Lowman c040054746 Findosg: New modules for osgQt and osgPresentation 
Added new find modules for osgQt and osgPresentation submitted by
Robert Osfield <robert.osfield@gmail.com>
 2012-01-28 17:35:20 -05:00
Rolf Eike Beer 1de14ec56e FindALSA: support version selection 2012-01-28 10:30:11 +01:00
Rolf Eike Beer 8a83853f5f FindGnuplot: add version selection 2012-01-28 10:27:44 +01:00
Rolf Eike Beer 00e30a0a34 FindJasper: fix library name 
Spotted by Patrick Spendrin.
 2012-01-27 22:37:31 +01:00
Rolf Eike Beer bde7b5aafd FindPythonInterp: try harder to get a version number 2012-01-27 21:15:53 +01:00
Rolf Eike Beer 3cc11c2f42 FindBISON: add a version expression for GNU Bison 1.x 2012-01-27 20:40:55 +01:00
Rolf Eike Beer 0bee3d9539 FindOpenSSL: properly parse the hex version components 2012-01-27 17:51:29 +01:00
Rolf Eike Beer 8e8db31f33 FindPostgreSQL: support version selection 2012-01-26 21:58:34 +01:00
Rolf Eike Beer 9d7a00104f FindLibXml2: detect version when PkgConfig is not used 2012-01-26 18:35:13 +01:00
Rolf Eike Beer 0640ec9476 FindCURL: detect version number also for older versions 
Older versions of cURL do not have a curlver.h, but have the version define
directly in curl.h.
 2012-01-26 18:25:25 +01:00
Rolf Eike Beer 815a6a2e5c FindTIFF: support version selection 2012-01-26 18:19:31 +01:00
Rolf Eike Beer 49b69add60 FindLua51: add version support 2012-01-26 09:07:53 +01:00
Rolf Eike Beer 1eaf1c9b0f SelectLibraryConfigurations: do not output identical configurations 
If the debug and release libraries are the same (which usually means only one
of them was found) do not output the library as "optimized" and "debug", but
just as one plain library. At the end this means that the Find* output of the
avarage (Un*x) user will be much less cluttered.
 2012-01-26 09:06:47 +01:00
Rolf Eike Beer e01fe583b8 FindTclsh: support version selection 2012-01-25 18:37:25 +01:00
Rolf Eike Beer 409aeafa25 FindRuby: do not blindly set version to 1.8.0 
RUBY_VERSION was always set, even if no RUBY_EXECUTABLE was found. While it
may make sense to assume a default version if we can't execute the binary, it
certainly doesn't make sense to report a version if there is no executable at
all.
 2012-01-25 18:33:08 +01:00
Rolf Eike Beer 0051506aa4 FindPNG: support version selection 2012-01-25 18:24:57 +01:00
Rolf Eike Beer 77e6c6fe84 FindGettext: support version selection 2012-01-25 18:02:50 +01:00
David Cole 731f996ce0 Merge topic 'improve-findbzip2' 
5b6ca9f FindBZip2: add support for debug libraries (#12867)
40fb005 FindBZip2: add support for version checking
 2012-01-25 11:20:00 -05:00
David Cole dc3fb5ac4e Merge topic 'improve-findjasper' 
a580a23 FindJasper: support version number
9bf7c4e FindJasper: find debug libraries
 2012-01-25 11:19:51 -05:00
David Cole c444cf73dd Merge topic 'flex-version' 
0b2e81c FindFLEX: fix version parsing when the executable is quoted
2cf5df3 FindFLEX: fix version parsing for old flex versions
 2012-01-25 11:19:38 -05:00
David Cole ddc1eb5ecd Merge topic 'improve-findcurl' 
c1b8849 FindCURL: support version selection
 2012-01-25 11:19:25 -05:00
David Cole 55e7d4071f Merge topic 'improve-findexpat' 
7f81c48 FindEXPAT: support version number
 2012-01-25 11:19:09 -05:00
David Cole 1226207a6e Merge topic 'improve-findcups' 
be2b108 FindCups: major overhaul
 2012-01-25 11:18:55 -05:00
David Cole c8b7f8e365 Merge topic 'improve-findgit' 
a803a62 FindGit: support version number
 2012-01-25 11:18:41 -05:00
David Cole 8372bd98a9 Merge topic 'improve-findgnutls' 
b5719fb FindGnuTLS: partly support version selection
 2012-01-25 11:18:29 -05:00
David Cole 825b9dde3d Merge topic 'improve-libxml2' 
a5fd391 FindLibXml2: support version selection
 2012-01-25 11:18:18 -05:00
David Cole 5ee225dbbd Merge topic 'use-pkgconfig-quiet' 
ede3ec5 use pkg_check_modules() quiet in other modules
 2012-01-25 11:18:03 -05:00
David Cole f47fea95d7 Merge topic 'find-threads-11333' 
3dc6f2b FindThreads: Try pthreads with no special option first (#11333)
 2012-01-25 11:17:29 -05:00
David Cole 476679afaf Merge topic 'GetPrerequisites-rpath-OSX' 
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.
 2012-01-25 11:17:12 -05:00
David Cole ac1c2a00b1 Merge topic 'FPHSA-CONFIG_MODE-doc' 
26015ba FindPackageHandleStandardArgs: fix documentation
 2012-01-25 11:16:39 -05:00