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

18780 Commits

Author SHA1 Message Date
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
KWSys Robot 208569f1da KWSys Nightly Date Stamp 2012-01-26 00:05:05 -05:00
Brad King 7d20619fbe Clarify IMPORTED_ target property documentation 
These properties are meant to be set to tell CMake something, not read
to get information from CMake.
 2012-01-25 16:26:40 -05:00
Brad King f9c1c6225c Add test covering imported target scope rules 2012-01-25 14:43:07 -05:00
Brad King ca39c5cdd1 Optionally allow IMPORTED targets to be globally visible 
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.
 2012-01-25 14:42:31 -05: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 055999a1ef Merge topic 'emacs-mode-indent-issue-12908' 
7da35e6 cmake-mode.el: Indent after multiline argument (#12908)
 2012-01-25 11:17:55 -05:00
David Cole 30620e7477 Merge topic 'uninitialized-var-in-if' 
54fd9e3 fix uninitialized var in if(NOT foo bar STREQUAL "foo bar")
 2012-01-25 11:17:46 -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 352279cdc2 Merge topic 'loadcommand-test-cleanup' 
1531c11 LoadCommand test: cleanup
 2012-01-25 11:16:52 -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 3c5489bd0f Merge topic 'test_find_modules' 
8d83043 AllFindModules test: also check Qt3 modules if Qt4 is not found
e797e7f AllFindModules test: keep complete output
ec631d5 add a test that loops through most Find* modules
 2012-01-25 11:15:47 -05:00
David Cole d05d71389a Merge topic 'eof-newlines' 
0541a03 GenerateExportHeader test: add newlines before end of file
 2012-01-25 11:15:35 -05:00
David Cole 5737cdbcbd Merge topic 'update-dashmacmini2-qt' 
7240aa7 Update dashmacmini2 release script to use Qt 4.6.3
 2012-01-25 11:15:22 -05:00
David Cole cef75ca909 Merge topic 'install-command-cleanup' 
982b5d9 cmInstallCommand: Fix line length for style
a64b618 cmInstallCommand: Remove duplicated sentence from docs
01ddef8 cmInstallCommand: Fix indentation error
 2012-01-25 11:15:03 -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
KWSys Robot 31c53c288c KWSys Nightly Date Stamp 2012-01-25 00:05:06 -05:00
Eric NOULARD 62b589b4cd Suppress unused var, beautify code, avoid 1 extra newline. 
There remains extra newlines in text Formatter output
but the parser does not seem to be the culprit.
The formatter should be.
 2012-01-24 23:38:22 +01: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
KWSys Robot 99180a0bb2 KWSys Nightly Date Stamp 2012-01-24 00:05:16 -05: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
Brad King 7da35e6550 cmake-mode.el: Indent after multiline argument (#12908) 
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>
 2012-01-23 13:59:27 -05:00