Commit Graph

2332 Commits

Author SHA1 Message Date
Alex Neundorf
af3a288e55 -add QUIET keyword to pkgconfig macros
Synced from KDE svn: pkg_check_modules() and pkg_search_module() now
both support a QUIET keyword. When given, no messages will be printed (except the REQUIRED ones)

This also fixes #10469 (confusing output of FindLibXml2.cmake)

Alex
2010-05-08 10:36:42 +02:00
Alex Neundorf
edb0fb2207 -add support for QtMultimedia in UseQt4.cmake (#10675)
Alex
2010-05-06 21:12:46 +02:00
Brad King
a443308c37 Load compiler information after configuring it
After configuring CMakeFiles/CMake<lang>Compiler.cmake in the build tree
the second time (to store ABI information), include it immediately.
This allows any logic and settings in the compiler information files to
be used without duplicating it in CMakeDetermineCompilerABI.cmake.

The change in commit "Use Fortran ABI detection results conservatively"
(2010-05-05) needs this to use the same logic to set CMAKE_SIZEOF_VOID_P
during first and later runs of CMake.
2010-05-06 11:26:49 -04:00
Brad King
0457d53151 Use Fortran ABI detection results conservatively
We set CMAKE_Fortran_SIZEOF_DATA_PTR in the Fortran compiler information
file after detecting the compiler ABI.  However, since Fortran does not
really have pointers, the preprocessor-based detection is unreliable.
The result is needed to set CMAKE_SIZEOF_VOID_P only for Fortran-only
projects because the value can come from C or C++ compilers otherwise.
Therefore when CMAKE_SIZEOF_VOID_P is available from another language we
should defer to it.
2010-05-05 17:46:29 -04:00
David Cole
e0acb6ca5f Fix Windows-cl.cmake so that at most one MSVC** variable is defined.
The expectation of users of the MSVC60, MSVC70, MSVC71, MSVC80, MSVC90
and the new MSVC10 variables is that at most one of them will be set
for any given build tree. This change enforces that expectation for
build trees using Makefile generators. It also fixes the one mismatch
in that expectation to be found in the Visual Studio generator world:
previously, the VS 7.1 generator would set *both* MSVC70 and MSVC71;
now, it only sets MSVC71.

With these changes, user expectations are now met, and the recently
introduced CheckCompilerRelatedVariables test should pass everywhere.
2010-05-05 17:08:06 -04:00
Bill Hoffman
1d64fa884e Fix FindCurses.cmake for new cygwin releases. 2010-05-04 11:54:55 -04:00
Bill Hoffman
5fd87f6d1a Fix for bug #10670, add another location to find MSBuild. 2010-05-04 10:44:09 -04:00
David Cole
2938263636 Fix missing set of MSVC10 and add CheckCompilerRelatedVariables test. 2010-04-30 00:46:24 -04:00
C. Bergström
36d850b87e Detect PathScale Fortran compiler tools
Include names pathf(90|95|2003) in the search for a Fortran compiler.
Also associate the names with PathScale for the vendor-specific search.
2010-04-26 13:31:52 -04:00
Bill Hoffman
0da537d167 Do not error out if the java version is not found, if java is not required. 2010-04-25 16:05:21 -04:00
Alex Neundorf
0dbd6e8e16 -add more names for libpng, so it also support libpng 1.4 on Windows (#10551)
Alex
2010-04-19 18:32:10 +02:00
Kovarththanan Rajaratnam
272308a406 FindDart: use find_package_handle_standard_args() 2010-04-18 09:27:31 +02:00
Kovarththanan Rajaratnam
da4388045e FindDart: mark DART_ROOT as advanced 2010-04-18 09:27:30 +02:00
Kovarththanan Rajaratnam
068fbd17a3 FindGLU: add deprecation message 2010-04-18 09:27:30 +02:00
Kovarththanan Rajaratnam
932d08adb8 FindGCCXML: document variables 2010-04-18 09:27:29 +02:00
Kovarththanan Rajaratnam
d359a72e79 FindGCCXML: mark executable as advanced 2010-04-18 09:27:28 +02:00
Kovarththanan Rajaratnam
3ca4749558 FindLibXslt: move include statement + misc whitespace cleanup 2010-04-17 11:10:15 +02:00
Kovarththanan Rajaratnam
293d8aee07 FindAVIFile: use find_package_handle_standard_args() 2010-04-17 11:10:09 +02:00
Kovarththanan Rajaratnam
172e93bd96 FindPhysFS: use find_package_handle_standard_args() 2010-04-17 11:09:45 +02:00
Kovarththanan Rajaratnam
9629443616 FindQuickTime: use find_package_handle_standard_args() 2010-04-17 11:07:32 +02:00
Kovarththanan Rajaratnam
5abed16cc2 FindZLIB: only set INCLUDE_DIRECTORIES/LIBRARIES if zlib is found 2010-04-17 09:56:00 +02:00
Kovarththanan Rajaratnam
7c9e72ad23 FindLibXml2: move include statement 2010-04-17 08:31:26 +02:00
Kovarththanan Rajaratnam
db3134d2a1 Make VERBOSE_FLAG appear as first statement for consistency 2010-04-17 07:49:21 +02:00
Bill Hoffman
6202d9612c Fix support of VS Express 10, but looking for MSBuild in the right place. 2010-04-16 12:48:23 -04:00
Kovarththanan Rajaratnam
bbd9392bc3 FindMPEG: mark variables in cache as advanced 2010-04-16 12:03:02 +02:00
Kovarththanan Rajaratnam
d4a9ce31ba FindMPEG: also check if MPEG_vo_LIBRARY is valid 2010-04-16 11:26:25 +02:00
Kovarththanan Rajaratnam
d62d1fd73d FindEXPAT: else() not needed 2010-04-16 11:04:23 +02:00
Kovarththanan Rajaratnam
d5b85448eb FindJasper: don't put JASPER_LIBRARIES into cache
This means that the user no longer sees this value _but_ this is backwards compatible because setting JASPER_LIBRARIES had no effect previously because we would override it using set()
2010-04-16 11:01:05 +02:00
Kovarththanan Rajaratnam
8981fa35d8 FindJasper: don't set JASPER_LIBRARIES twice 2010-04-16 10:45:32 +02:00
Kovarththanan Rajaratnam
0f57a51f75 FindJasper: no need to set QUIETLY explicitly 2010-04-16 10:38:15 +02:00
Kovarththanan Rajaratnam
1f8a67b2ee FindASPELL: no need to set QUIETLY explicitly 2010-04-16 10:30:33 +02:00
Kovarththanan Rajaratnam
32a3b1fb40 FindHSPELL: capitalize Hspell properly 2010-04-16 10:26:31 +02:00
Kovarththanan Rajaratnam
810d9a30ef FindHSPELL: add version support 2010-04-16 10:25:02 +02:00
Kovarththanan Rajaratnam
99313f4fe9 FindHSPELL: no need to set QUIETLY explicitly 2010-04-16 10:09:07 +02:00
Alex Neundorf
d827b9f21d -add basic search directories for the "Generic" platform
As reported on the mailing list, find_path/file/library/program() basically don't work
at all if CMAKE_FIND_ROOT_PATH is set and searching in the host system directories
is disabled. This patch adds /include, /lib and /bin to the search directories, so they
will be appended to CMAKE_FIND_ROOT_PATH so this will work for the "Generic" platform (embedded
systems without OS)

Alex
2010-04-14 22:09:19 +02:00
Kovarththanan Rajaratnam
4d6e0f39c2 FindSubversion: simplify using FindPackageHandleStandardArgs() 2010-04-11 20:40:02 +02:00
Kovarththanan Rajaratnam
44f631e6df FindBZip2: no need to set QUIETLY explicitly 2010-04-11 11:31:48 +02:00
Kovarththanan Rajaratnam
c70e0aa3eb FindBZip2: remove BZIP2_DEFINITIONS from doc (it's not referenced) 2010-04-11 11:31:48 +02:00
Kovarththanan Rajaratnam
79442f8045 FindZLIB: add support for version handling (fixes #5588)
This change depends on the fix for #9414 which should land very soon.
2010-04-11 10:55:51 +02:00
Kovarththanan Rajaratnam
001efa5961 FindZLIB: add support for GnuWin32 (fixes #5588) 2010-04-11 10:55:50 +02:00
Kovarththanan Rajaratnam
5ea4992621 FindZLIB: FindPackageHandleStandardArgs already contains the quiet handling 2010-04-11 10:55:50 +02:00
Alex Neundorf
981c7f5a5b -check for the ARM ABI/EABI compiler ABI for the GNU compilers
The names are:
EABI: "ELF ARMEABI"
non-EABI: "ELF ARM"

Alex
2010-04-11 00:15:23 +02:00
Alex Neundorf
f99771ce0a -revert the previous unintended commit
Alex
2010-04-10 23:49:09 +02:00
Alex Neundorf
8d907e298b -no change, don't know why git wants to commit something
(I accidentially removed ExternalProject.cmake from git by doing
mv ExternalProject.cmake ExternalProject.cmake.save
git checkout master
which I hoped would basically do a revert as it does with svn and cvs, but it
deleted the file from git)

Alex
2010-04-10 23:49:09 +02:00
Eric NOULARD
fcdbe001ea CPackRPM:: Fix bug #10363, specify compression type in RPM spec
This is a feature request
--Eric
2010-04-10 11:23:01 +02:00
Kovarththanan Rajaratnam
f233a9b3af Remove spurious tabs 2010-04-09 22:02:16 +02:00
Clinton Stimpson
c94303fcac Revert "Include relative path in generated qrc and uic files. Fixes #10413."
This reverts commit 108090fde9.
2010-04-08 16:39:15 -06:00
Chuck Atkins
e750761857 OpenBSD: Work-around static/runtime linker inconsistency
Detect the runtime linker's search path and add to the compile time
linker's search path.  This is needed because OpenBSD's static linker
does not search for shared library dependencies in the same places as
the runtime linker.
2010-03-26 09:33:28 -04:00
Alex Neundorf
1cad103db1 it's CMAKE_COMPILER_IS_GNUCC, not CMAKE_COMPILER_IS_GNUGCC
Patch from Brad Hards <bradh AT frogmouth DOT net>

Alex
2010-03-25 23:19:59 +01:00
Bill Hoffman
570ceeb4a4 Teach CMake how to work with G95 on mingw. 2010-03-23 11:32:40 -04:00