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
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
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
David Cole
2e69c0534f
Merge topic 'FindPkgConfig-REQUIRED-issue-12620'
...
55c3435
FindPkgConfig: respect REQUIRED (#12620 )
2012-01-25 11:16:22 -05:00
David Cole
a1c1350a1f
Merge topic 'python-version'
...
aa11536
FindPythonInterp: fix version parsing
0fe4d69
FindPythonInterp: make version selectable
2012-01-25 11:16:01 -05:00
David Cole
9d57dfee6a
Merge topic 'openssl-version'
...
bb2b264
FindOpenSSL: also parse version number define with uppercase letters
7053a00
FindOpenSSL: only try to parse opensslv.h if it exists
44ba7a3
Merge branch 'master' of git://cmake.org/cmake into openssl-version
8e8672c
FindOpenSSL: improve version number handling
2012-01-25 11:14:49 -05:00
David Cole
c6a33dce36
Merge topic 'FindProtobuf_import_dirs'
...
27bc9e2
FindProtobuf: Update documentation comment for 2.8.8
84079c9
FindProtobuf: Merge patch that allows extra import dirs
2012-01-25 11:14:38 -05:00
Rolf Eike Beer
5b6ca9fa3f
FindBZip2: add support for debug libraries ( #12867 )
...
The debug library has a different name on Windows. Make sure both versions
work.
Thanks to Patrick Spendrin for testing this.
2012-01-24 19:12:50 +01:00
Rolf Eike Beer
40fb00512a
FindBZip2: add support for version checking
2012-01-24 19:12:46 +01:00
Rolf Eike Beer
a580a23635
FindJasper: support version number
2012-01-24 19:08:07 +01:00
Rolf Eike Beer
9bf7c4e7e1
FindJasper: find debug libraries
2012-01-24 19:08:07 +01:00
Rolf Eike Beer
0b2e81c63c
FindFLEX: fix version parsing when the executable is quoted
2012-01-23 23:40:17 +01:00
Rolf Eike Beer
c1b884965f
FindCURL: support version selection
2012-01-23 21:46:56 +01:00
Rolf Eike Beer
7f81c48bdd
FindEXPAT: support version number
2012-01-23 20:54:04 +01:00
Rolf Eike Beer
be2b108776
FindCups: major overhaul
...
This introduces CUPS_VERSION_STRING and ports the module over to use FPHSA for
all the benefits that come with it.
2012-01-23 20:31:47 +01:00
Rolf Eike Beer
1562b9c0b9
FindImageMagick: make use of more FPHSA features
...
This includes version number and printing the first found result if something
was found instead of "TRUE".
2012-01-23 20:13:27 +01:00
Rolf Eike Beer
a803a622d0
FindGit: support version number
2012-01-23 20:10:42 +01:00
Rolf Eike Beer
b5719fb727
FindGnuTLS: partly support version selection
...
For the Un*x systems where we use PkgConfig to find the library we can also
use the version returned from there.
2012-01-23 20:07:46 +01:00
Rolf Eike Beer
a5fd3915c9
FindLibXml2: support version selection
2012-01-23 20:06:03 +01:00
Rolf Eike Beer
ede3ec5a79
use pkg_check_modules() quiet in other modules
...
Those modules will already print what they found or not using FPHSA, no need
to do this twice.
2012-01-23 20:03:49 +01:00
Rolf Eike Beer
3dc6f2bfb3
FindThreads: Try pthreads with no special option first ( #11333 )
...
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.
2012-01-21 22:24:19 +01:00
Rolf Eike Beer
2cf5df3e58
FindFLEX: fix version parsing for old flex versions
2012-01-20 18:27:43 +01:00
Yury G. Kudryashov
26015baba3
FindPackageHandleStandardArgs: fix documentation
...
State explicitly what CONFIG_MODE argument does.
2012-01-20 09:09:47 -05:00