Commit Graph

3380 Commits

Author SHA1 Message Date
Brad King b524f864ca Merge topic 'fix-9148-cpack-nsis-installer-root'
5a9e8e7 CPack: Add CPACK_NSIS_INSTALL_ROOT variable (#9148)
2011-01-11 15:48:34 -05:00
David Cole 5a9e8e701e CPack: Add CPACK_NSIS_INSTALL_ROOT variable (#9148)
Control the root directory of the default directory presented to
the end user of an NSIS installer by a CPack variable.

Previously, the value used in the NSIS script was $PROGRAMFILES,
which is equivalent to the "ProgramFiles" environment variable.
That default value is still the same, but now a project may
override the value by setting this new variable.
2011-01-11 15:42:42 -05:00
Marcus D. Hanwell 2d3594b1bb Python additional version support, bug #10279.
Introduced an additional variable, Python_ADDITIONAL_VERSIONS, to both
FindPythonLibs and FindPythonInterp. Changed FindPythonInterp to loop
over versions rather than hardcoding all versions (more like libs).
2011-01-10 13:44:45 -05:00
Brad King c2d73c938a Allow platform files to set large archive rules (#11674)
Commit aaa88d33 (Build large archives incrementally, 2008-08-04)
hard-coded rules to create static archives incrementally in each
language information file.  Set each rule conditionally to allow
compiler and platform information files to override the language
default rules.

Inspired-by: Harald Pohl <pohl.h@eppendorf.de>
2011-01-10 09:58:55 -05:00
David Cole d67a513447 ExternalProject: Replace location tags in CMAKE_CACHE_ARGS
When we added CMAKE_CACHE_ARGS, we did not try it with any
<SOURCE_DIR> or <INSTALL_DIR> references. This commit fixes
that accidental omission.
2011-01-07 08:04:16 -05:00
David Cole d7a87b52a0 Merge branch 'ep-log-output-under-vs' into ep-fix-substitutions 2011-01-07 07:59:21 -05:00
David Cole 44aff73d4a ExternalProject: Avoid bleed-through output when logging.
Unset VS_UNICODE_OUTPUT when executing a command whose output
is being logged to a file. Previously, running Microsoft tools
in sub-processes of Visual Studio would send their output to
the Visual Studio output pipe named by this environment variable.

Unsetting it forces the output back to the normal stdout and stderr
channels where cmake can intercept it and direct it to the
appropriate log files.
2011-01-06 18:29:44 -05:00
Mike McQuaid bee514c361 Add CPack NSIS MUI_FINISHPAGE_RUN support (#11144)
MUI_FINISHPAGE_RUN is frequently used with NSIS and provides a checkbox
on the finish page of an installer which specifies whether the specified
executable should be run when the installer exits. This commit adds support
for this setting in CPack.
2011-01-06 16:21:36 -05:00
Mike McQuaid 702c8f8ba7 Add CPACK_NSIS_EXECUTABLES_DIRECTORY (#7828)
NSIS installers default to assuming the executables exist in a
directory named "bin" under the installation directory. As this
isn't usual for Windows programs, the addition of this variable
allows the customization of this directory and links still to be
created correctly.
2011-01-06 16:21:23 -05:00
Mike McQuaid 753b429ec4 InstallRequiredSystemLibraries debug-only (#11141)
Add support to InstallRequiredSystemLibraries to only install
debug libraries when both debug and release versions are available.

This is as if you are building a debug package then only the debug
versions are needed but not the release.
2011-01-06 12:22:03 -05:00
Mike McQuaid 492cd84fc5 Add variable for InstallRequiredSystemLibraries dir (#11140)
InstallRequiredSystemLibraries currently defaults to installing to
bin on WIN32 and lib otherwise. This patch allows you to configure
this by using the variable CMAKE_INSTALL_SYSTEM_RUNTIME_DESTINATION.

It also switches the logic to use a single INSTALL(PROGRAMS) command
rather than two deprecated uses of the INSTALL_PROGRAMS command.
2011-01-06 12:21:35 -05:00
Mike McQuaid dd5c592ce8 Fix incorrect variable documentation (#11127)
In InstallRequiredSystemLibraries the documentation details the
variable CMAKE_SKIP_INSTALL_RULES to skip installation. This
actually doesn't do anything, the variable required is named
CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS_SKIP. This commit amends the
documentation to point to the correct variable.
2011-01-06 12:21:11 -05:00
David Cole ed2b314e4f Add PATH_SUFFIXES for finding git.
This commit makes it automatic to find msysGit installed
in its default locations on Windows.
2011-01-06 10:09:48 -05:00
Brad King 79f5a7c098 Merge topic 'compiler-id-literal-const'
dbc79bd Fix constness in compiler id detection
2011-01-04 15:44:56 -05:00
Brad King 61063f12eb Merge topic 'recognize-TI-DSP'
f1392dc Recognize the Texas Instruments DSP compiler (#11645)
2011-01-04 15:44:50 -05:00
Brad King 138a79628b Merge topic 'FindBoostTypos'
5103fe5 Lowercase all function names and improve consistency
97c8f77 Fix spelling BOOST_LIBRARYDIR message. Add error for common misspellings.
2011-01-04 15:44:39 -05:00
Brad King 3556ab9f72 Merge topic 'add_support_for_windres'
971692c Build enable_language command during bootstrap
960ace1 Add testing for windows resources for mingw/msys/cygwin and remove for watcom.
060d6e8 Add support for windres to cygwin.
b2f308c Add support for windows resources with mingw/msys.
2011-01-04 15:44:07 -05:00
Alex Neundorf ce28737c93 Remove usage of CMAKE_CURRENT_LIST_DIR now that we have CMP0017
This puts the new search behaviour for included files in action, i.e.
now when a file from Modules/ include()s another file, it also gets the
one from Modules/ included, i.e. the one it expects.

Alex
2011-01-04 08:20:08 -05:00
Bill Hoffman 90b0f2c624 Enable resource building with the intel compiler on windows. 2011-01-03 14:02:22 -05:00
Clinton Stimpson e6bb8c7a6e Add support for using static/dynamic Qt plugins. 2011-01-01 11:45:05 -07:00
Brad King dbc79bd8c8 Fix constness in compiler id detection
Since commit 70c2dc8a (Make compiler id detection more robust,
2008-03-10) we store compiler identification strings in test binaries
using the form

  char* info = "info";

Use the const-correct

  char const* info = "info";

form instead.  This allows the C++ compiler identification to work with
"-Werror -Wall" or equivalent flags if the compiler would warn about
const-to-non-const conversion.
2010-12-29 15:35:15 -05:00
Brad King 93460cc1d5 Merge topic 'bug-11518-dbus-macro'
d640d54 allow absolute paths for dbus interface.
2010-12-28 15:26:37 -05:00
Brad King 96d0203bc0 Merge topic 'FindBLAS_FindLAPACK'
51253da FindLAPACK works with C/C++ only projects (issue 0009976)
e64b5da fix for Fortran-only projects
1279bd7 find ACML fixes
2010-12-28 15:26:26 -05:00
Brad King 9ffe22b2eb Merge topic 'mac-headerpad_max_install_names-passthru'
e498527 Pass Mac linker flag through all compilers with -Wl,
2010-12-28 15:26:00 -05:00
Brad King 8b73f54bc6 Merge topic 'dev/use-fphsa-in-find-opengl'
937e369 Use FPHSA in FindOpenGL
2010-12-28 15:25:19 -05:00
Wojciech Migda f1392dc90b Recognize the Texas Instruments DSP compiler (#11645)
The TI DSP compiler predefines "__TI_COMPILER_VERSION__".  Use this to
identify the C and C++ compilers.  For assembler language the C compiler
executable is used:

  $ cl6x -h
  TMS320C6x C/C++ Compiler v6.1.11
  Tools Copyright (c) 1996-2009 Texas Instruments Incorporated

Use this command-line option and output to recognize the assembler.
2010-12-28 12:22:38 -05:00
Philip Lowman 5103fe58ee Lowercase all function names and improve consistency 2010-12-27 23:04:30 -05:00
Philip Lowman 97c8f77484 Fix spelling BOOST_LIBRARYDIR message. Add error for common misspellings. 2010-12-27 22:51:43 -05:00
Alexey Ozeritsky 51253da8bb FindLAPACK works with C/C++ only projects (issue 0009976) 2010-12-27 11:42:41 +03:00
Alexey Ozeritsky e64b5daece fix for Fortran-only projects 2010-12-27 11:37:46 +03:00
Alexey Ozeritsky 1279bd7bac find ACML fixes 2010-12-27 11:14:13 +03:00
Bill Hoffman 060d6e885e Add support for windres to cygwin. 2010-12-23 17:04:50 -05:00
Bill Hoffman b2f308c8f9 Add support for windows resources with mingw/msys. 2010-12-23 17:04:49 -05:00
Clinton Stimpson d640d549d5 allow absolute paths for dbus interface. 2010-12-23 09:21:56 -07:00
Brad King e498527f1d Pass Mac linker flag through all compilers with -Wl,
The Mac linker defines flag -headerpad_max_install_names but not all
front-ends recognize the flag and pass it through (many did in the past,
such as the Apple port of GCC).  Use the -Wl, option prefix to tell
front-ends to pass it through without trying to interpret it.
2010-12-22 16:28:54 -05:00
Brad King 9f46051490 Merge topic 'cygwin'
85c0a69 Cygwin: Do not define 'WIN32' (#10122)
62c6d2d Merge branch 'cmake_--system-information_min-version' into cygwin
72db20f Merge branch 'tests-if-CYGWIN' into cygwin
5adef16 Merge branch 'cygwin-module-prefix' into cygwin
cbc3258 Merge branch 'try-compile-min-version' into cygwin
2010-12-21 14:06:32 -05:00
Brad King b44632ef6f Merge topic 'cmake_--system-information_min-version'
a6cb1d4 Declare min CMake version in --system-information project
2010-12-21 14:04:41 -05:00
Brad King d89514f190 Merge topic 'CheckCCompilerFlag-strict-prototypes'
b3efdb5 CheckCCompilerFlag: Strict signature of 'main' (#11615)
2010-12-21 13:58:57 -05:00
Brad King 98d9611ffa Merge topic 'gnu-compiler-windows-info'
e8d380f Remove unused old-style g++ info file
2010-12-21 13:58:46 -05:00
Brad King 6f2482aa97 Merge topic 'intel-compiler-windows-info'
cd43636 Modernize Intel compiler info on Windows
58c73c4 Detect Fortran target architecture on Windows
2010-12-21 13:58:39 -05:00
Brad King 92631c14d9 Merge topic 'intel-config-definitions'
3fb088e Make Intel defines consistent with MSVC on Windows (#9904)
2010-12-21 13:58:29 -05:00
Brad King 451567cda3 Merge topic 'FindBLAS_FindLAPACK'
cabafa3 ACML find fixes (issue 0011219)
4f00763 FindBLAS works in C/C++ projects without Fortran
2010-12-21 13:58:14 -05:00
Brad King 85c0a69a92 Cygwin: Do not define 'WIN32' (#10122)
One of Cygwin's goals is to build projects using the POSIX API with no
Windows awareness.  Many CMake-built projects have been written to test
for UNIX and WIN32 but not CYGWIN.  The preferred behavior under Cygwin
in such projects is to take the UNIX path but not the WIN32 path.

Unfortunately this change is BACKWARDS INCOMPATIBLE for Cygwin-aware
CMake projects!  Some projects that previously built under Cygwin and
are Cygwin-aware when they test for WIN32 may now behave differently.
Eventually these projects will need to be updated, but to help users
build them in the meantime we print a warning about the change in
behavior.  Furthermore, one may set CMAKE_LEGACY_CYGWIN_WIN32 to request
old behavior during the transition.

Normally we avoid backwards incompatible changes, but we make an
exception in this case for a few reasons:

(1) This behavior is preferred by Cygwin's design goals.

(2) A warning provides a clear path forward for everyone who may see
incompatible behavior, and CMAKE_LEGACY_CYGWIN_WIN32 provides a
compatibility option.  The warning and compatibility option both
disappear when the minimum required version of CMake in a project is
sufficiently new, so this issue will simply go away over time as
projects are updated to account for the change.

(3) The fixes required to update projects are fairly insignificant.
Furthermore, the Cygwin distribution has no releases itself so project
versions that predate said fixes tend to be difficult to build anyway.

(4) This change enables many CMake-built projects that did not
previously build under Cygwin to work out-of-the-box.  From bug #10122:

  "I have built over 120 different source packages with (my patched)
   CMake, including most of KDE4, and have found that NOT defining
   WIN32 on Cygwin is much more accurate." -- Yaakov Selkowitz

A fully compatible change would require patches on top of these project
releases for Cygwin even though they otherwise need not be aware of it.

(5) Yaakov has been maintaining a fork of CMake with this change for the
Cygwin Ports distribution.  It works well in practice.  By accepting the
change in upstream CMake we avoid confusion between the versions.

CMake itself builds without WIN32 defined on Cygwin.  Simply disable
CMAKE_LEGACY_CYGWIN_WIN32 explicitly in our own CMakeLists.txt file.
2010-12-17 14:19:58 -05:00
Brad King ad25a968b9 Merge branch 'ImprovedDotSupport2' into dev/strict-mode
Conflicts:
	Source/cmake.cxx
2010-12-17 10:32:01 -05:00
Brad King c128abe383 Merge branch 'AddCMAKE_CURRENT_LIST_DIR' into dev/strict-mode
Conflicts:
	Source/cmMakefile.cxx
2010-12-17 10:31:41 -05:00
Brad King 9bcaff02ff Merge branch 'cmake-guiRememberAdvancedCheckbox' into dev/strict-mode
Conflicts:
	Source/QtDialog/CMakeSetupDialog.cxx
2010-12-17 10:31:19 -05:00
Brad King 62c6d2d7e7 Merge branch 'cmake_--system-information_min-version' into cygwin 2010-12-17 10:18:56 -05:00
Brad King a6cb1d4653 Declare min CMake version in --system-information project
The --system-information flag's project triggered a CMP0000 warning
because the CMakeLists.txt it generates needs cmake_minimum_required.
2010-12-17 09:39:30 -05:00
Brad King 3a6c480908 Merge topic 'cygwin-module-prefix'
1dcc977 Cygwin: Use 'cyg' prefix for module DLLs (#10122)
2010-12-16 14:00:06 -05:00
Brad King 72163de0a5 Merge topic 'NAG-Fortran'
09d1c10 FortranCInterface: Recognize NAG Fortran module symbols
af2ad90 Add NAG Fortran compiler information files
24cc3d4 Recognize the NAG Fortran compiler
83892c4 Allow Fortran platform files to set empty values
fe3f878 Detect object files in implicit link information
2010-12-16 13:59:52 -05:00
Brad King b3efdb58d5 CheckCCompilerFlag: Strict signature of 'main' (#11615)
Use "int main(void)" instead of just "int main()" so that compiling with
"gcc -Werror=strict-prototypes" works.  Test this check using the flags
"-Werror -Wstrict-prototypes" to work with old GCC versions.
2010-12-16 13:34:54 -05:00
Brad King e8d380f90d Remove unused old-style g++ info file
Since commit aff31479 (Modernize GNU compiler info on Windows,
2009-12-02) the file Modules/Platform/Windows-g++.cmake has been unused.
It just includes the non-existent Modules/Platform/Windows-gcc.cmake so
remove it outright.
2010-12-16 10:09:29 -05:00
Brad King cd43636c95 Modernize Intel compiler info on Windows
This moves Intel compiler info on Windows into new-style modules

  Platform/Windows-Intel-<lang>.cmake

using language-independent helper module

  Platform/Windows-Intel.cmake

to define macros consolidating the information.
2010-12-16 09:50:05 -05:00
Brad King 58c73c43f6 Detect Fortran target architecture on Windows
Commit 4430bccc (Change the way 32/64 bit compiles are detected with
MSVC and intel, 2009-11-19) added detection of the target processor to C
and CXX language builds with MS and Intel tools.  Do the same for Intel
Fortran for Windows (ifort).  Use /machine:<arch> to link executables.
2010-12-16 09:33:06 -05:00
Alexey Ozeritsky cabafa37fb ACML find fixes (issue 0011219) 2010-12-16 14:40:58 +03:00
Alexey Ozeritsky 4f00763814 FindBLAS works in C/C++ projects without Fortran 2010-12-16 13:34:13 +03:00
Brad King 3fb088e521 Make Intel defines consistent with MSVC on Windows (#9904)
Add /DWIN32 and /D_WINDOWS to default config-independent flags.
Add /D[_N]DEBUG to default flags for each configuration.
2010-12-15 17:56:24 -05:00
Eric NOULARD 07bd856bd0 CPackSTGZ quote here-doc, fix bug10518 2010-12-15 21:20:13 +01:00
Brad King 9e7e106dcb Merge topic 'external-project-args-file'
3bc828d Fixed bug where last entry would be lost.
b316087 Escape file write expansion, and build up lists.
68cd3fe Added CMAKE_CACHE_ARGS to ExternalProject.
2010-12-14 14:39:06 -05:00
Brad King 2c7d36ce6f Merge topic 'CPackRPM-Fix0011595'
8d366cd CPackRPM fix bug 0011595 : Can't generate RPMs (on FC11...)
2010-12-14 14:39:00 -05:00
Brad King 03c4623fb4 Merge topic 'ParallelEclipseMakefiles2'
27ee50a Add ECLIPSE_CDT4_GENERATE_SOURCE_PROJECT as a ADVANCED cache variable (#9631)
50d21d4 Add cache var CMAKE_ECLIPSE_MAKE_ARGUMENTS when using the Eclipse generator
2010-12-14 14:38:55 -05:00
Brad King 8e7f0488b4 Merge topic '11445-workaround'
a80d6e9 Add Boost 1.46
88babef [patch] Add Boost 1.45 to search, simplify a check removing VERSION_LESS
2010-12-14 14:38:42 -05:00
Brad King 5bea0917ef Merge topic 'fix_incremental_vs2010'
cddcad5 Fix incremental linking for VS2010 with nmake or make.
2010-12-14 14:38:27 -05:00
Brad King b3f2d19ba7 Merge topic 'FindTCL-version-ref'
d95913e FindTCL: Fix TCL and TK version variable references (#11528)
2010-12-14 14:38:23 -05:00
Brad King d4b4db68e1 Merge topic 'FixDocTypoInFindFLEX'
3ce0049 Fix typos in the doc
2010-12-14 14:37:42 -05:00
Alex Neundorf 27ee50a7d8 Add ECLIPSE_CDT4_GENERATE_SOURCE_PROJECT as a ADVANCED cache variable (#9631)
This variable has been supported since 2.6 I think, having it in the cache
makes it easier to use (see bug report #9631)

Alex
2010-12-13 21:53:11 +01:00
Yaakov Selkowitz 1dcc9777a7 Cygwin: Use 'cyg' prefix for module DLLs (#10122)
Cygwin now uses the prefix 'cyg' for plugin DLLs instead of 'lib'.
2010-12-13 14:21:07 -05:00
Eric NOULARD 8d366cd1eb CPackRPM fix bug 0011595 : Can't generate RPMs (on FC11...) 2010-12-13 20:11:06 +01:00
Marcus D. Hanwell 3bc828df9a Fixed bug where last entry would be lost.
The code to build up a list was missing the final entry in an initial
cache.
2010-12-13 12:50:38 -05:00
Philip Lowman a80d6e9828 Add Boost 1.46 2010-12-13 01:21:46 -05:00
Philip Lowman 88babefbcc [patch] Add Boost 1.45 to search, simplify a check removing VERSION_LESS
Also some whitespace issues are cleaned up.
Patch from Adam Richardson attached to #11445
2010-12-13 00:56:42 -05:00
Alex Neundorf 50d21d4251 Add cache var CMAKE_ECLIPSE_MAKE_ARGUMENTS when using the Eclipse generator
This variable can be set to command line arguments which will be passed
to make when eclipse invokes make, e.g. you can enter "-j8" to get
8 parallel builds (#9930)

Alex
2010-12-12 16:52:20 +01:00
Marcus D. Hanwell b316087c09 Escape file write expansion, and build up lists.
Escaped the @var@ in the file writes - this was being expanded at file
write and so not causing a reconfigure at the right time. I also took
care of build up lists of lists in the variables, especially important
for things like MPI_EXTRA_LIBRARY. Added some error checking, and use
the tmp_dir for initial cache file.
2010-12-11 12:11:27 -05:00
Marcus D. Hanwell 68cd3fe038 Added CMAKE_CACHE_ARGS to ExternalProject.
On Windows the limit for command line arguments is 8192 characters, and
this was limiting longer paths with some of our more nested projects
such as Library. Placing the -D arguments into CMAKE_CACHE_ARGS will
write out an initial cache file, that will be passed to CMake with a -C
argument as the initial cache.

By forcing the cache variables we preserve the existing behavior with
-D, to change the values of cache variables in our inner projects.
2010-12-10 17:41:41 -05:00
Brad King 09d1c1080d FortranCInterface: Recognize NAG Fortran module symbols 2010-12-09 18:12:42 -05:00
Brad King af2ad90991 Add NAG Fortran compiler information files
On Linux the NAG Fortran compiler uses gcc under the hood to link.  Use
"-Wl,-v" to pass "-v" to the underlying gcc compiler to get verbose link
output.  Detect the NAG Fortran directory (using -dryrun) and then honor
object files in the directory referenced in the implicit link line.
Pass real linker options with "-Wl,-Xlinker,".  The -Wl, gets through
the NAG front-end and the -Xlinker gets through the gcc front-end.
2010-12-09 18:12:34 -05:00
Brad King 24cc3d4817 Recognize the NAG Fortran compiler
The Numerical Algorithms Group (NAG) Fortran compiler does not document
a preprocessor macro to identify it.  Check for identifying output using
the -V option.
2010-12-09 17:51:47 -05:00
Brad King 83892c4a11 Allow Fortran platform files to set empty values
Teach CMakeFortranInformation to use default flags only for variables
that have not been set at all, rather then not set or empty.  This will
allow platform or compiler-specific information files to set empty
values without getting the defaults.
2010-12-09 17:51:47 -05:00
Brad King fe3f878f15 Detect object files in implicit link information
The NAG Fortran compiler implicitly passes object files by full path to
the linker.  Teach CMakeParseImplicitLinkInfo to parse object files that
match some tool-specific regular expression.
2010-12-09 17:07:34 -05:00
Bill Hoffman cddcad5102 Fix incremental linking for VS2010 with nmake or make.
VS2010 deprecated /INCREMENTAL:YES.  This change makes
/INCREMENTAL the flag to use for incremental linking with
VS2010.
2010-12-09 13:32:48 -05:00
Kai Wasserbäch d95913e232 FindTCL: Fix TCL and TK version variable references (#11528)
FindTCL.cmake switched variables in the FIND_LIBRARY invocation.  The
FIND_LIBRARY() statement for TCL used the TK variables and vice versa.
This patch reverses that into the right usage.

Closes debian issue 600245.
2010-12-09 11:31:00 -05:00
Ben Boeckel 937e3693d7 Use FPHSA in FindOpenGL
This gets FindOpenGL to obey the QUIET and REQUIRED options correctly.
2010-12-08 17:41:37 -05:00
Alex Neundorf 3ce00499d4 Fix typos in the doc
Alex
2010-12-07 21:13:25 +01:00
David Cole c2895f48a4 BundleUtilities: error if fixup_bundle_item called on non-embedded item
Also, improve the documentation of the fixup_bundle and fixup_bundle_item
functions to clarify that plugin type "libs" need to be copied into
the bundle *before* calling fixup_bundle.

Commit e93a4b4d34 changed the way that
the libs parameter to fixup_bundle is interpreted. Before the commit,
the libs were copied into the bundle first and then fixed up. After
the commit, the copy was skipped, assuming the libs were in the bundle
in the first place, and then the fixups occurred as before.

However, before the commit, it was possible to name a lib from outside
the bundle, and have it copied in and then fixed up. Its resolved
embedded name was always inside the bundle before. After, its resolved
embedded name was just the same as its resolved name, which is in its
original location, and not necessarily inside the bundle.

This manifested itself as a problem with the ParaView call to
fixup_bundle and its many plugins. Previously, ParaView had simply
passed in the list of plugin file names as they existed in the build
tree, and left the copying into the bundle up to the fixup_bundle
function. When built with CMake 2.8.3 (the first version to contain
the above named commit) the fixup_bundle call would inadventently
fixup libraries in the build tree, not libraries that were in the
bundle. Furthermore, the plugins would not be in the final bundle.

This points out the fact that the fix for the bugs made by the above
commit was a backwards-incompatible change in behavior.

This commit makes it an error to try to fixup an item that is not
already inside the bundle to make the change in behavior apparent
to folks who were depending on the prior copy-in behavior: now,
they should get an error, and hopefully, reading the new and
improved documentation, should be able to resolve it in their
projects by adding code to install or copy in such libraries prior
to calling fixup_bundle.

Whew.
2010-12-06 16:35:59 -05:00
Brad King c300ef1c66 Merge topic 'qt4-deps-tiff-jpeg-mng'
bd66cc9 Fix build issues cross compiling with static Qt.
2010-12-02 14:25:26 -05:00
Brad King 1060aaf086 Merge topic 'bundleutils-rpath-removal'
28c1be7 BundleUtilities: only do rpath strip on copied prerequisites.
2010-12-02 14:25:16 -05:00
Clinton Stimpson bd66cc9d39 Fix build issues cross compiling with static Qt.
Also fix case where system jpeg, png, tiff libs are used.
2010-11-23 16:01:43 -07:00
Clinton Stimpson 28c1be7a50 BundleUtilities: only do rpath strip on copied prerequisites. 2010-11-23 14:29:46 -07:00
David Cole bc43385d23 Merge topic 'FindITK-use-find_package'
38b0a84 Modernize FindITK module (#11494)
2010-11-23 16:12:21 -05:00
David Cole 22c138646a Merge topic 'pgi-mac'
eda7841 Pass Mac linker flag through PGI compiler using "-Wl,"
2010-11-23 16:12:18 -05:00
David Cole f04bc9fe93 Merge topic '11384'
0263d8d 11384: FindCxxTest now includes test code in VS project
2010-11-23 16:11:50 -05:00
David Cole c985676a96 Merge topic '11430'
a44a05c 11430: FindBullet doesn't find header files installed by Bullet >= 2.77
2010-11-23 16:11:46 -05:00
David Cole fcea494787 Merge topic 'IncludeCMakeDetermineCompilerIdInDetermineASMCompiler'
e3dfbf6 Include CMakeDetermineCompilerId in CMakeDetermineASMCompiler.cmake (#11467)
2010-11-23 16:11:40 -05:00
David Cole 584612595d Merge topic 'spelling'
8f1798c Modules: Fix spelling 'becase' -> 'because'.
2010-11-23 16:11:37 -05:00
David Cole 525b528625 Merge topic 'CPackRPM-ComponentSupport'
66e86b4 CPack  fix kwstyle breakage and make CPackRPM backward compatible
2c84d16 CPackRPM  add basic component support to CPackRPM
2010-11-23 16:11:33 -05:00
David Cole fa882bb570 Merge topic 'AddASM_NASMSupport'
e0b6016 Some more fixes for nasm support, from Etienne (#10069)
d25c2eb Use CMAKE_ASM_NASM_FLAGS for nasm instead of FLAGS
e614e9b Add support for yasm, a nasm compatible assembler
79dd9be We already have 2010, fix copyright year.
ffeca06 Add missing copyright headers
7b337ac Improve misleading comments.
e1fc9b9 Add support for nasm assembler, patch by Peter Collingbourne (see #10069)
2010-11-23 16:11:22 -05:00
David Cole 88281035bd Merge topic 'moc-includes-regex'
35b91ac Fix regex for moc includes when looking for frameworks.
2010-11-23 16:11:15 -05:00
Brad King 38b0a84eea Modernize FindITK module (#11494)
Use the Config mode of find_package to search for ITKConfig.  This makes
FindITK a thin-wrapper around a standard find_package, bringing benefits
like searching lib64 paths when appropriate.  This does for FindITK what
commit 2c1a01dc (Modernize FindVTK module, 2009-10-07) did for FindVTK.
2010-11-22 13:52:58 -05:00
Brad King eda7841fd2 Pass Mac linker flag through PGI compiler using "-Wl,"
The Mac linker defines -headerpad_max_install_names and the GCC
front-end passes this flag through.  The PGI compiler does not know
about this flag, so we must use -Wl,-headerpad_max_install_names to pass
it to the linker instead.
2010-11-22 08:43:13 -05:00
Philip Lowman 0263d8dffe 11384: FindCxxTest now includes test code in VS project
The test code header files are now included in the test target so they
will show up under "Header Files" in Visual Studio targets, for example.
2010-11-18 23:31:14 -05:00
Philip Lowman a44a05cd9d 11430: FindBullet doesn't find header files installed by Bullet >= 2.77 2010-11-18 22:24:21 -05:00
Alex Neundorf e3dfbf62fc Include CMakeDetermineCompilerId in CMakeDetermineASMCompiler.cmake (#11467)
CMakeDetermineASMCompiler.cmake relied on that somebody else (usually
during enabling C or CXX) already included that file, and broke if that
was not the case.
Thanks to Louis for the patch

Alex
2010-11-17 23:01:36 +01:00
Andrius Štikonas 8f1798c14a Modules: Fix spelling 'becase' -> 'because'. 2010-11-17 11:12:48 -05:00
David Cole 164b11deb7 Merge topic 'EP-extra-generator'
74e49aa BUG 11451 - pass CMAKE_EXTRA_GENERATOR down.
2010-11-16 14:46:46 -05:00
David Cole c172ffef06 Merge topic 'cray-compiler'
53e76c8 Teach CMake about Cray C, C++, and Fortran compilers
34e1ac2 Create Fortran info variables for .mod behavior
2010-11-16 14:46:30 -05:00
David Cole caf680c4d7 Merge topic 'FixFindQt3REQUIRED'
a39ee97 Fix #11421: FindQt3.cmake doesn't honor the REQUIRED keyword
2010-11-16 14:46:04 -05:00
Eric NOULARD 2c84d169b3 CPackRPM add basic component support to CPackRPM
basic means 1 RPM per component and no dependency handling
this implies some CPackGenerator refactoring
2010-11-13 17:56:36 +01:00
Marcus D. Hanwell 74e49aa441 BUG 11451 - pass CMAKE_EXTRA_GENERATOR down.
This patch fixes the behavior of external projects with respect to
generators using the CMAKE_EXTRA_GENERATOR variable.
2010-11-12 19:43:05 -05:00
Alex Neundorf e0b60166d4 Some more fixes for nasm support, from Etienne (#10069)
Alex
2010-11-12 20:27:18 +01:00
Brad King 53e76c8f12 Teach CMake about Cray C, C++, and Fortran compilers
The Cray Fortran compiler needs "-em" to enable module output and also
"-J." to place the .mod files in the current working directory (instead
of next to the .o file).
2010-11-12 09:12:08 -05:00
Philip Lowman 1321eb9796 11429: FindGTK2 does not find libraries built for Visual Studio 2010
Adds support for detecting builds of FindGTK2 with Visual Studio 2010.
Thanks to Vincent Levesque for the patch.
2010-11-09 21:43:08 -05:00
Alex Neundorf a39ee97c6c Fix #11421: FindQt3.cmake doesn't honor the REQUIRED keyword
Alex
2010-11-09 21:51:59 +01:00
David Cole 0c1261658b Merge topic 'FindPerlLibs-mac'
20ceccc FindPerlLibs: Fix for Mac locally applied patches
2010-11-09 15:44:47 -05:00
David Cole b5f9be1d03 Merge topic 'CheckCompilerFlag-foreign-MSVC'
79e0233 BUG: Fix compiler flag test for non-English MSVC (#11336)
2010-11-09 15:37:33 -05:00
David Cole 9692d5a2b6 Merge topic '11363'
fffe1c0 11363: FindBoost.cmake fails to find debug libraries in tagged layout install
2010-11-09 15:29:11 -05:00
David Cole 384816e4de Merge topic 'FixBisonWithLocale'
506805c Make FindBISON work properly with non-C locales (#11326)
2010-11-09 15:28:33 -05:00
David Cole 5965ff5112 Merge topic 'qt4-resources-bug5952'
de04854 Force cmake to run again when qrc dependency scanning needs to happen.
2010-11-09 15:27:55 -05:00
David Cole b5a46cab85 Merge topic 'qt4-imports-dir'
cfba5ef Fix regression in 2dae2f1 which added find of Qt imports dir.
2010-11-09 15:27:23 -05:00
Dave Abrahams 20ceccc4f2 FindPerlLibs: Fix for Mac locally applied patches
Previously FindPerlLibs did not work with the Mac stock Perl because it
includes patches.  From "perl -V":

  Locally applied patches:
    /Library/Perl/Updates/<version> comes before system perl directories
    installprivlib and installarchlib points to the Updates directory

Adjust paths accordingly.
2010-11-08 11:09:41 -05:00
Brad King 79e02333a6 BUG: Fix compiler flag test for non-English MSVC (#11336)
Approach suggested by John Stark.
2010-11-04 08:50:17 -04:00
Philip Lowman fffe1c07d9 11363: FindBoost.cmake fails to find debug libraries in tagged layout install 2010-10-28 22:51:18 -04:00
David Cole e561a46c1a Merge topic 'getprerequisites-endless-path-appending'
48e80eb Fixes to GetPrerequisites for cygwin
bee4802 Append the gp_tool path to the system PATH using native slashes.
8e550ba Remove unecessary TO_CMAKE_PATH for gp_cmd_dir.
1684198 Switch to CMAKE_PATH when doing PATH comparisons on Windows.
be94c49 Fixed appending PATH to dumpbin tool from growing without bounds.
2010-10-28 14:11:07 -04:00
David Cole 3f3f3e5f54 Merge topic 'CPackDeb-MoreControl'
a749724 CPackDeb Added several optional debian binary package fields
2010-10-28 14:10:23 -04:00
David Cole ec93cd2ead Merge topic 'fix-11173'
6e1282f ExternalProject: No svn --username if empty (#11173)
2010-10-28 14:10:01 -04:00
David Cole 5b43d8f8b1 Merge topic 'external-project-extra-gen'
beeca11 Fixed parallel build for generators with EXTRA.
2010-10-28 14:09:43 -04:00
David Cole 424ba550e5 Merge topic 'PythonLibs-2.7'
1f369a7 ENH: Added case for Python 2.7.
2010-10-28 14:09:17 -04:00
David Partyka 48e80eb724 Fixes to GetPrerequisites for cygwin
Fix IF(WIN32) guards check for cygwin. Fix checking if the depenency is in a system location to use cygwin style paths on cygwin. Also change GetPrerequisites to switch gp_tool to tools that are very unlikely to be found, ie. dumpbin on Apple and otool on Windows/Unix.
2010-10-27 17:23:00 -04:00
David Partyka bee4802840 Append the gp_tool path to the system PATH using native slashes. 2010-10-26 11:12:12 -04:00
David Partyka 8e550ba31e Remove unecessary TO_CMAKE_PATH for gp_cmd_dir.
It is already using CMAKE style paths.
2010-10-26 10:28:42 -04:00
David Partyka 1684198706 Switch to CMAKE_PATH when doing PATH comparisons on Windows.
Users PATH may contain elements that end with backslash. This will escape the semicolon when iterating resulting in mismatches.

Fix indentation.

Fix whitespace
2010-10-26 10:28:38 -04:00
Eric NOULARD a749724029 CPackDeb Added several optional debian binary package fields
This fixes bugs #0011355  and 0008342.
The merged patch is a contribution from Michael Lasmanis and Petri Hodju
with some extra documentation added by the merger.
2010-10-25 20:40:45 +02:00
David Partyka be94c494ed Fixed appending PATH to dumpbin tool from growing without bounds.
IF(... MATCHES ...) used for comparing directories chokes especially in the case of C:\Program Files (x86)\<blah> because of regex pattern matching. Switched this to use STREQUAL in a loop instead.
2010-10-25 13:40:35 -04:00
David Cole 6e1282f840 ExternalProject: No svn --username if empty (#11173)
Nor --password. But please do if non-empty. Thank you.
2010-10-22 16:23:27 -04:00
Marcus D. Hanwell beeca11c9b Fixed parallel build for generators with EXTRA.
Fixed parallel build for projects using generators that have the
CMAKE_EXTRA_GENERATOR as well as CMAKE_GENERATOR. Thanks to Bill Hoffman
for helping me to track this one down, I missed parallel builds.
2010-10-22 11:16:21 -04:00
Alex Neundorf d25c2eb0c0 Use CMAKE_ASM_NASM_FLAGS for nasm instead of FLAGS
Alex
2010-10-21 20:57:14 +02:00
Alex Neundorf e614e9b3d7 Add support for yasm, a nasm compatible assembler
Alex
2010-10-21 20:51:46 +02:00
David Cole b0fb2ad3e1 Merge topic 'AddCMAKE_CURRENT_LIST_DIR'
b011840 Use absolute path to FindPackageHandleStandardArgs.cmake everywhere
41e4f1a Add automatic variable CMAKE_CURRENT_LIST_DIR(dir of CMAKE_CURRENT_LIST_FILE)
f9fc79c Remove trailing whitespace
2010-10-19 15:53:16 -04:00
Marcus D. Hanwell 1f369a71c8 ENH: Added case for Python 2.7. 2010-10-19 14:53:33 -04:00
Alex Neundorf 506805c999 Make FindBISON work properly with non-C locales (#11326)
Applying the patch attached to http://public.kitware.com/Bug/view.php?id=11326
It sets LC_ALL to C before calling execute_process(), so the output is
in english.

Alex
2010-10-18 21:44:42 +02:00
Clinton Stimpson de0485459c Force cmake to run again when qrc dependency scanning needs to happen. 2010-10-15 16:46:39 -06:00
Clinton Stimpson cfba5ef111 Fix regression in 2dae2f1 which added find of Qt imports dir. 2010-10-15 16:36:14 -06:00
David Cole e2476232c0 Merge topic 'FindBoost_bugfix_cleanup'
b867a3f Remove superfluous variable Boost_COMPAT_STATIC_RUNTIME.
2010-10-12 11:12:16 -04:00
David Cole e4508ac82f Merge topic 'FindHDF5-is-parallel'
3445532 FindHDF5: Fix typo in parallel-IO support check (#11291)
2010-10-12 11:12:00 -04:00
David Cole 0ecc8a409c Merge topic 'findmpi-msmpi-update'
35d2770 Update module to locate newely released MS MPI HPC Pack R2.
2010-10-12 11:11:47 -04:00
David Cole b14764c29c Merge topic 'qt4-imports-dir'
2dae2f1 Find imports dir in Qt 4.7
2010-10-12 11:08:51 -04:00
Philip Lowman b867a3f1a8 Remove superfluous variable Boost_COMPAT_STATIC_RUNTIME.
There is no need to introduce this extra variable as FindBoost
can simply rely on if Boost_USE_STATIC_RUNTIME is defined
or not to disable the old searching behavior for static runtime
libraries on WIN32.
2010-10-11 22:48:33 -04:00
Brad King 3445532652 FindHDF5: Fix typo in parallel-IO support check (#11291) 2010-10-11 09:35:46 -04:00
David Partyka 35d2770df9 Update module to locate newely released MS MPI HPC Pack R2. 2010-10-11 09:20:07 -04:00
Clinton Stimpson 2dae2f1a0b Find imports dir in Qt 4.7 2010-10-08 20:55:55 -06:00
Rolf Eike Beer d2f8c5f8ab FindSubversion: Use C locale to detect version (#11273)
Force LC_ALL to C before the call of the svn executable as it is done in
the Subversion_WC_INFO macro a few lines below.
2010-10-07 11:10:40 -04:00
Rolf Eike Beer 42126aaf6c FindSubversion: Fix for German localized client (#11273)
On a Win32 system with a German version of SilkSVN I couldn't run CMake
again on the working copy as the cache is displayed as corrupted. The
cause is that the regular expression to find the version number will not
match and put everything from the "svn --version" output into the cache,
which contains umlauts and other funny characters.

Fix the regexp to not only match " version " but also " Version " as
it's in the German output. I have no idea what will happen on a French
or Japanese system. This should be easy to test as it happens also on a
German Linux system.
2010-10-07 10:04:19 -04:00
Brad King ba3064b584 Merge topic 'FindCUDA-allow-g3'
6916f8d Allow -g3 for CUDA v3.0+.
2010-10-05 15:33:12 -04:00
Brad King 100f2ad278 Merge topic 'Fix-0011263-CUDA_SDK_PATH'
1df8516 Fix for bug 0011263.
2010-10-05 15:32:58 -04:00
Brad King f7c58fe5f3 Merge topic 'CPackHandleParenthesisInSystemName'
4a4a53f CPackRPM  Handle parenthesis in CPACK_SYSTEM_NAME (fix bug 10737)
2010-10-05 15:32:13 -04:00
Brad King cb314e250b Merge topic '11279'
aca758b Fixes issue 11279: CMakeDetermineVSServicePack support for VS10
2010-10-05 15:30:32 -04:00
Brad King b38297d2d1 Merge topic 'vs-load-Windows-ifort'
20f4973 Reset platform/compiler info status for each language
2010-10-05 15:21:25 -04:00
James Bigler 6916f8dba7 Allow -g3 for CUDA v3.0+.
In versions of the CUDA toolkit previous to version 3.0 the use of -g3 would cause
compilation errors.  This was fixed in version 3.0.
2010-10-04 16:42:21 -06:00
James Bigler 1df8516c0e Fix for bug 0011263.
Added CUSDKCOMPUTE_ROOT to the list of paths when looking for CUDA_SDK_ROOT_DIR.
2010-10-04 16:11:08 -06:00
Eric NOULARD 4a4a53f3dd CPackRPM Handle parenthesis in CPACK_SYSTEM_NAME (fix bug 10737)
merge patch from Frank Stappers
2010-10-03 23:29:34 +02:00
Philip Lowman aca758bf29 Fixes issue 11279: CMakeDetermineVSServicePack support for VS10
Thanks to Aaron C. Meadows for the patch.
2010-09-30 21:24:28 -04:00
Alex Neundorf b01184022b Use absolute path to FindPackageHandleStandardArgs.cmake everywhere
This is to avoid getting an (older) copy of FPHSA.cmake which is
e.g. installed with KDE 4.5.0 and 4.5.1.

Alex
2010-09-28 22:30:31 +02:00
Brad King dbf7664c99 Merge topic 'PutRequiredVersionInDetailMessageInFPHSA'
567ac0b Also store the required version number in the details message.
2010-09-28 14:05:15 -04:00
Brad King e66c12a265 Merge topic 'python_module_prefix_suffix'
d36c16a Set the module prefix, updated Windows suffix.
2010-09-28 14:04:24 -04:00
Brad King c86d677fe0 Merge topic 'findqt4-cross-compile'
25931ae Fix regression in cross-compile patches with finding Qt libs.
2010-09-28 14:03:37 -04:00
Brad King c0665ca795 Merge topic 'DescriptionsForFeatureSummaryALL'
b935f00 Close ENDFUNCTION() properly with the same name as FUNCTION()
07bca48 Set a default DESCRIPTION if none is given for ALL mode of feature_summary()
d5b2915 APPEND and not-APPEND mode of feature_summary() were swapped
2010-09-28 14:02:19 -04:00
Brad King 20f49730ae Reset platform/compiler info status for each language
In each CMake<lang>Information.cmake file we use an _INCLUDED_FILE
variable to track whether a compiler information file has been loaded.
Reset this variable for each language.

This fixes Fortran under VS generators with the Intel plugin.
Previously the variable would be left set true from C and C++ and then
Fortran would not load old-style files like Platform/Windows-ifort.
2010-09-28 09:49:20 -04:00
Alex Neundorf 79dd9becad We already have 2010, fix copyright year.
Alex
2010-09-27 22:14:39 +02:00
Alex Neundorf 567ac0bb1f Also store the required version number in the details message.
This way the success/failure message of FPHSA() is also printed again
if the required version is changed.

Alex
2010-09-27 22:08:14 +02:00
Alex Neundorf ffeca06a93 Add missing copyright headers
Alex
2010-09-27 18:04:34 +02:00
Alex Neundorf 7b337ac8e2 Improve misleading comments.
(the assembler is not really tested)

Alex
2010-09-25 21:00:52 +02:00
Alex Neundorf e1fc9b902a Add support for nasm assembler, patch by Peter Collingbourne (see #10069)
Alex
2010-09-25 20:57:03 +02:00
David Gobbi d36c16a760 Set the module prefix, updated Windows suffix.
Set the Python module prefix to PYTHON_MODULE_PREFIX, and changed the
suffix on Windows to .pyd as .dll is officially deprecated.
2010-09-24 15:04:24 -04:00
Clinton Stimpson 25931ae10e Fix regression in cross-compile patches with finding Qt libs.
If a Qt installation is in CMAKE_PREFIX_PATH and a
QT_QMAKE_EXECUTABLE points to a qmake for a different Qt installation,
prefer finding libs in the latter Qt installation.
2010-09-23 16:50:09 -06:00
Brad King 8150dc4d2b Merge topic 'fix-11026'
4a323bd Honor MAKECOMMAND value saved in cache (#11026)
2010-09-22 13:53:46 -04:00
Brad King 14d5ea7438 Merge topic 'mingw-long-object-lists'
5f05a3c MinGW: Support long object file lists
2d9bb33 Evaluate <OBJECT_DIR> rule variable for executables
2010-09-22 13:52:24 -04:00
Brad King a60241913c Merge topic 'cygwin-system-processor'
2412d9b Use 'uname -m' for processor on Cygwin (#10774)
2010-09-22 13:52:10 -04:00
Brad King 89884a26fd Merge topic 'find-fltk-cygwin'
a6628d1 FindFLTK*: Use Cygwin fltk on Cygwin
2010-09-22 13:52:01 -04:00
David Cole 4a323bde0c Honor MAKECOMMAND value saved in cache (#11026)
Use a separate variable to pass to the BUILD_COMMAND call
and then use set(CACHE) to transfer that to MAKECOMMAND.
That way, if MAKECOMMAND is in the cache already, it is
left untouched. Fixes regression introduced in commit
0b38bb4c with the fix for bug #2336.

Thanks to Evgeniy P for the patch.
2010-09-21 21:51:40 -04:00
Yaakov Selkowitz 2412d9bc0e Use 'uname -m' for processor on Cygwin (#10774)
POSIX requires 'uname -m' but not 'uname -p':

  http://www.opengroup.org/onlinepubs/9699919799/utilities/uname.html

Indeed Cygwin 'uname -p' returns "unknown".
2010-09-21 17:32:49 -04:00
Yaakov Selkowitz a6628d154a FindFLTK*: Use Cygwin fltk on Cygwin
Do not set FLTK_PLATFORM_DEPENDENT_LIBS to contain win32 libraries.
Cygwin builds should use the fltk that comes with Cygwin.
2010-09-21 17:29:22 -04:00
Brad King 2f665d5d1f FindPythonInterp: Look for python2.7 interpreter
Python 2.7 was released on July 3rd, 2010.
2010-09-21 17:22:07 -04:00
Alex Neundorf b935f00fdf Close ENDFUNCTION() properly with the same name as FUNCTION()
Alex
2010-09-21 22:43:04 +02:00
Alex Neundorf 07bca48868 Set a default DESCRIPTION if none is given for ALL mode of feature_summary()
Alex
2010-09-21 22:31:04 +02:00
Alex Neundorf d5b29155b4 APPEND and not-APPEND mode of feature_summary() were swapped
Alex
2010-09-21 22:27:14 +02:00
Brad King 5970c0f947 Merge topic 'FindBoost_bugfixes'
b8b9a32 FindBoost.cmake: Fix library search path glitch introduced in earlier commit
90c16d8 FindBoost.cmake: Implements 11160
95ff120 FindBoost.cmake: Fixes 10436
5cce138 FindBoost.cmake: Fixes 11121
0239041 FindBoost.cmake: Fixes 11246
d4900c2 FindBoost.cmake: Fix compiling against a boost source tree
6ed7d99 FindBoost.cmake: Add Boost_NO_SYSTEM_PATHS option
16b0eb5 FindBoost.cmake: Miscellaneous changes and refactoring
5e6f0f0 FindBoost.cmake fixes for issues 11204 & 8529
2010-09-21 10:53:57 -04:00
Brad King b7539e3832 Merge topic 'compaq-fortran-moddir-flag'
c04af06 Add module-dir flag for Compaq Visual Fortran (#11248)
2010-09-21 10:41:02 -04:00
Brad King 8c865b3b25 Merge topic 'FindMPI-f-flags'
a56969f FindMPI: Recoginze -f flags from mpicc (#10771)
2010-09-21 10:40:39 -04:00
Brad King a8d0539598 Merge topic '11249_FindFLEX'
38691d9 FindFLEX.cmake: Fix issue 11249
2010-09-21 10:39:33 -04:00
Brad King c04af06009 Add module-dir flag for Compaq Visual Fortran (#11248)
This compiler uses "-module:" to specify where modules should be placed.
2010-09-20 09:53:45 -04:00
Brad King a56969f3d3 FindMPI: Recoginze -f flags from mpicc (#10771)
Parse compiler flags like "-fmessage-length=0 -fstack-protector
-funwind-tables -fasynchronous-unwind-tables -fno-strict-aliasing" from
the output of "mpicc -show".  We already handle preprocessor definition
arguments like -DUSE_STDARG.  Honor '-f' flags too.
2010-09-20 09:08:08 -04:00
Philip Lowman 38691d91a5 FindFLEX.cmake: Fix issue 11249
FindFLEX no longer sense a CMake fatal error if executing "flex --version" fails
unless the REQUIRED argument was specified.
2010-09-19 23:56:34 -04:00
Philip Lowman b8b9a32170 FindBoost.cmake: Fix library search path glitch introduced in earlier commit 2010-09-19 23:15:07 -04:00
Philip Lowman 7016fae6d4 Fix 11136: [patch] FindThreads.cmake documents the wrong variable
Fixed documentation to be correct.
2010-09-18 13:46:08 -04:00
Philip Lowman 90c16d84be FindBoost.cmake: Implements 11160
Add Boost_REALPATH option for people packaging Boost with their app:

Boost_REALPATH               Resolves symbolic links for discovered boost libraries
                             to assist with packaging.  For example, instead of
                             Boost_SYSTEM_LIBRARY_RELEASE being resolved to
                             "/usr/lib/libboost_system.so" it would be
                             "/usr/lib/libboost_system.so.1.42.0" instead.
                             This does not affect linking and should not be
                             enabled unless the user needs this information.
2010-09-18 11:57:42 -04:00
Philip Lowman 95ff12091d FindBoost.cmake: Fixes 10436
Add an additional library filename permutation which fixes
library detection for some custom builds of Boost.
2010-09-18 11:21:23 -04:00
Philip Lowman 5cce138c91 FindBoost.cmake: Fixes 11121
Add support for finding Boost.Thread with special THREADAPI in filename
2010-09-18 11:19:29 -04:00
Philip Lowman 02390416e1 FindBoost.cmake: Fixes 11246
FindBoost can find shared libraries (.so) in rare circumstances
even when Boost_USE_STATIC_LIBS is set
2010-09-18 11:16:09 -04:00
Philip Lowman d4900c2eca FindBoost.cmake: Fix compiling against a boost source tree
This fixes issues 11192 & 11187.
2010-09-18 10:59:42 -04:00
Philip Lowman 6ed7d9937a FindBoost.cmake: Add Boost_NO_SYSTEM_PATHS option
This fixes several duplicate issues in the tracker (7725, 11019, 8412)
2010-09-18 10:56:15 -04:00
Philip Lowman 16b0eb5ac5 FindBoost.cmake: Miscellaneous changes and refactoring
* Add a warning if the user sets Boost_ROOT which is not correct
* Clarify directions to the user for viewing debugging messages
* Move the CMAKE_FIND_LIBRARY_SUFFIXES tweak outside of a for loop
2010-09-18 10:41:53 -04:00
Philip Lowman 5e6f0f0d73 FindBoost.cmake fixes for issues 11204 & 8529
* Fixed issue 11204: FindBoost.cmake had trouble discovering libraries
  when both -sgd and -gd libraries were available by adding a new option
  Boost_USE_STATIC_RUNTIME.
  Backwards compatibility of searching for first -gd and then -sgd on
  WIN32 is maintained unless the user sets Boost_COMPAT_STATIC_RUNTIME to
  false (or they have set Boost_USE_STATIC_RUNTIME).
* Fixed issue 8529: FindBoost was unable to detect boost libraries compiled against
  STLport, by reworking the way the Boost ABI tag is calculated.  There are additional
  ABI tag options available now as well.
* Boost_DEBUG now reports the full list of filenames being searched for when
  find_library is called.
2010-09-18 10:24:30 -04:00
Brad King 5f05a3c25e MinGW: Support long object file lists
Use a combination of response files and the archiver to support long
object file lists that do not fit in the Windows command-line length
limit.  This can work only with GCC >= 4 because the MinGW GCC 3.x
front-ends do not support response-file syntax.
2010-09-17 09:25:36 -04:00
Ben Boeckel 6d7d449cb1 Ignore CLI warnings for ABI determination 2010-09-16 17:49:37 -04:00
Brad King ee66f21271 Merge topic 'issue_10199'
80bad29 Issue 10199: Fixed code documentation and now set <prefix>_WC_ROOT
2010-09-14 13:28:07 -04:00
Brad King f2a813d51c Merge topic 'CUDAv3.2PathChanges'
4f0636e Added CUDA 3.2 directory changes.  Disable emulation mode for CUDA 3.1+.
2010-09-14 13:19:10 -04:00
Marcel Loose 80bad29af6 Issue 10199: Fixed code documentation and now set <prefix>_WC_ROOT 2010-09-13 13:13:12 +02:00
James Bigler 4f0636e979 Added CUDA 3.2 directory changes. Disable emulation mode for CUDA 3.1+.
CUDA 3.2 on Windows systems changed the layout of the library paths.  This adds the extra
directories needed to locate the new files.

I also explicitly disable emulation mode for CUDA 3.1+.  This feature was deprecated in
3.0 and ultimately removed in 3.1.  The script errors out if CUDA_BUILD_EMULATION is
turned on.  I didn't want to ignore emulation mode (even with a warning - which most
people may not even see) and have users confused as to why it wasn't working.
2010-09-10 11:48:38 -06:00
David Cole 2f98dac486 Correct CMAKE_INSTALL_PREFIX value for Win64 apps (#9992)
The default value for CMAKE_INSTALL_PREFIX should be
based on what architecture the built targets are, not
what architecture CMake itself is.

This fix merely guesses better what the built targets
architecture is. It still may guess incorrectly in some
cases. For those cases, it will have to be up to build
scripts and developers on projects to pass in a correct
value for CMAKE_INSTALL_PREFIX with -D on the command line
or via 'force cache value' logic in CMakeLists.txt files.
2010-09-09 08:32:42 -04:00
Brad King f444b9555f Merge topic 'allow_upper_case_cpp_and_others'
7944e4e Allow testing of .CPP on WIN32 as it is a case insensitive OS and should work.
ba0a890 Only test for .CPP on Microsoft compilers which will handle .CPP as c++.
d26cd46 Only use .CPP .CXX and .C++ do not work by default with g+++.
ced61f5 Let CMake recognize .CPP .CXX and .C++ as c++ files.
2010-09-08 11:36:46 -04:00
Brad King 661d5166b0 Merge topic 'FindwxWidgets-fixes'
ede24f8 ENH #8993: FindwxWidgets add support for wx-config custom options.
3dbeeb7 BUG #8184: Fixed FindwxWidgets wrong order of default libs for MinGW.
f46712e BUG #11123: Generic include dir should come after config specific one.
6cb14eb STYLE: Clarified/Fixed documentation of UsewxWidgets.
36c15a2 BUG #10658: FindwxWidgets USE_FILE should not include .cmake extension.
2010-09-08 11:08:55 -04:00
Brad King 18c71e3c79 Merge topic 'fix-10417'
e93a4b4 Avoid adding self as prerequisite. (#10417)
2010-09-08 11:08:22 -04:00
Brad King 795676062e Merge topic 'fix-9284'
88fed66 Make bundle items writable before fixup (#9284)
2010-09-08 11:08:16 -04:00
Brad King 048c905f05 Merge topic 'hpux-required-runtime-path-10571'
11a917d HP-UX: Always add /usr/lib to rpath (#10571)
2010-09-08 11:08:13 -04:00
Brad King dd0b68a214 Merge topic '11186'
c167595 Merge patch for detecting gdk-pixbuf library
2010-09-08 11:08:09 -04:00
Brad King 28edb70a9e Merge topic 'vs-project-groups'
e6ac0aa Add FOLDER target property, for IDEs (#3796)
2010-09-08 11:08:05 -04:00
Brad King 02e3f42a6a Merge topic 'watcom_fixes'
3b7da53 Fix for bug 10388, fix various default flags.
2010-09-08 11:08:01 -04:00
Brad King 2079424568 Merge topic 'find-macports'
eae45a6 Search MacPorts /opt/local prefix on Mac
2010-09-08 11:07:59 -04:00
Brad King 4ea441eaf9 Merge topic 'ImproveFindPackageConfigMode'
5cdfc9c Improve wording of the error message of find_package() in config-mode
4969c3b Improve version notice in the generated message
e8ae504 Add option CONFIG_MODE to FPHSA()
b4b8f96 Don't create an empty element at the end of Foo_CONSIDERED_CONFIGS/VERSIONS
cc955a0 Small cleanup of FindPackageHandleStandardArgs.cmake
0367245 Replace the two vector<string,string> with one vector<struct{string,string}>
130b0e2 Improve error message in Config-mode when no appropriate version was found
dfe9c95 Record all considered Config files and their versions.
2010-09-08 11:07:55 -04:00
Mike McQuaid 88fed668b1 Make bundle items writable before fixup (#9284)
This ensures that any bundle items are made user writable before
any attempt is made to alter them using install_name_tool. This is
because MacPorts/Fink/Homebrew don't install libraries as writable.
This fix is needed to allow fixup_bundle_item to work correctly
when ingesting libraries installed by these package managers.
2010-09-07 22:49:32 -04:00
David Cole e93a4b4d34 Avoid adding self as prerequisite. (#10417)
Thanks to Clinton Stimpson for the patch.
2010-09-07 21:29:43 -04:00
Brad King 11a917d04e HP-UX: Always add /usr/lib to rpath (#10571)
Set CMAKE_PLATFORM_REQUIRED_RUNTIME_PATH in the HP-UX platform file to
tell CMake to pass -Wl,+b,/usr/lib no matter whether RPATH is enabled or
not.  This corrects the behavior of -Wl,+nodefaultrpath to look in this
default library path as documented.
2010-09-07 08:44:19 -04:00
Miguel A. Figueroa-Villanueva ede24f8171 ENH #8993: FindwxWidgets add support for wx-config custom options.
Added suport for setting a custom toolkit, refix, etc. when using
wx-config.
2010-09-05 09:39:37 -04:00
Philip Lowman c1675951a0 Merge patch for detecting gdk-pixbuf library
The gdk-pixbuf library was split off from core GTK in 2.21 so it could be used
separately by people outside GTK.  Now FindGTK searches and adds it to the
library/include list.  Thanks to Vincent Untz for the patch and Ricardo Cruz
for the heads up.
2010-09-03 22:05:09 -04:00
David Cole e6ac0aacf6 Add FOLDER target property, for IDEs (#3796)
This work was started from a patch by Thomas Schiffer.
Thanks, Thomas!

See the newly added documentation of the FOLDER target
property for details.

Also added global properties, USE_FOLDERS and
PREDEFINED_TARGETS_FOLDER. See new docs here, too.

By default, the FOLDER target property is used to organize
targets into folders in IDEs that have support for such
organization.

This commit adds "solution folder" support to the Visual
Studio generators. Currently works with versions 7 through
10.

Also, use the new FOLDER property in the ExternalProject
test and in the CMake project itself.
2010-09-03 13:53:22 -04:00
Bill Hoffman d26cd46989 Only use .CPP .CXX and .C++ do not work by default with g+++. 2010-09-02 18:02:57 -04:00
Bill Hoffman 3b7da5396d Fix for bug 10388, fix various default flags. 2010-09-02 14:35:17 -04:00
Bill Hoffman ced61f5722 Let CMake recognize .CPP .CXX and .C++ as c++ files. 2010-09-02 11:56:40 -04:00
Bill Hoffman f794d589a4 Make --strict-mode option, and integrate with cmake-gui 2010-09-01 13:08:14 -04:00
Miguel A. Figueroa-Villanueva 3dbeeb7793 BUG #8184: Fixed FindwxWidgets wrong order of default libs for MinGW.
Also fixed usage sample in comments, which can be misleading for MinGW
users as demonstrated by mantis issue #10089.
2010-09-01 12:27:31 -04:00
Miguel A. Figueroa-Villanueva f46712ebe7 BUG #11123: Generic include dir should come after config specific one. 2010-09-01 10:40:01 -04:00
Miguel A. Figueroa-Villanueva 6cb14ebf16 STYLE: Clarified/Fixed documentation of UsewxWidgets. 2010-09-01 09:34:57 -04:00
Brad King eae45a67e7 Search MacPorts /opt/local prefix on Mac
Include this prefix in CMAKE_SYSTEM_PREFIX_PATH so that it will be used
for all find* commands.  Previously only find_library and find_path
would look under /opt/local/lib and /opt/local/include, respectively.
2010-09-01 08:50:51 -04:00
Brad King 8e76221754 Merge topic 'FindGTK2_10688'
7828932 10688: FindGTK2.cmake doesn't auto-detect macports
2010-09-01 08:42:18 -04:00
Miguel A. Figueroa-Villanueva 36c15a2f0b BUG #10658: FindwxWidgets USE_FILE should not include .cmake extension.
The wxWidgets_USE_FILE variable to be used with the include command
should be set to UsewxWidgets; not UsewxWidgets.cmake.
2010-09-01 00:15:07 -04:00
Brad King f628cac5b0 Merge topic 'FindwxWidgets-fixed-bug-9775'
f51eb9c BUG: #9775 Fixed patch FindwxWidgets-fixed-bug-9775.
6bbf2a0 ENH: #9775 Added support for new wxWidgets 2.9 libraries.
2010-08-31 14:53:57 -04:00
Brad King 39da06e8fa Merge topic 'FindPackageLogVersion'
88e6447 Add macro ADD_FEATURE_INFO() and improve docs.
b353524 Improve wording of the documentation.
6fc88b2 Improve documentation.
3333878 Log the required package version and major improvement to FeatureSummary
2010-08-31 14:35:46 -04:00
Brad King b3f878d013 Merge topic 'fix-10747'
90add6b Refine formatting for cmake --help-module output.
af0c719 Merge branch 'patches/docBundleUtilities'
51cc861 Improve documentation of GetPrerequisites.cmake
f811470 Improve documentation of BundleUtilities.cmake
2010-08-31 14:25:20 -04:00
Brad King f95074ba70 Merge topic 'CPack-FixDESTDIR-Issue7000'
3178767 Merge 'CPack-FixDESTDIR-Issue7000' from github.com:TheErk/CMake
6a521f8 CPack   Enable better handling of absolute installed files
40dc97d CPack   Backward-compatibly enforce DESTDIR for DEB and RPM
2010-08-31 14:22:59 -04:00
Brad King 2391002d86 Merge topic 'moc_param_bug11120'
2756311 Make sure moc parameters file goes in binary directory.
2010-08-31 14:19:59 -04:00
Brad King 7e3f04e7e9 Merge topic 'FindBison_10241'
a53b47a 10241: FindBISON.cmake clears wrong variable
2010-08-31 14:19:14 -04:00
Brad King 4262c29d14 Merge topic 'FindCxxTest_11041'
ed78a72 11041: Improve FindCxxTest to use Python or Perl automatically; custom flags
2010-08-31 14:19:02 -04:00
Miguel A. Figueroa-Villanueva f51eb9cb0c BUG: #9775 Fixed patch FindwxWidgets-fixed-bug-9775.
Forgot to add new libraries in list of libs to be cleared.
2010-08-30 19:38:45 -04:00
Alex Neundorf 4969c3b5bb Improve version notice in the generated message
Now the version number is also printed if no required version was
specified, but a version number was detected (showing more information
shouldn't hurt).
The code for generating the failure message in config-mode is moved
into a separate helper macro, it was becoming too much.

Alex
2010-08-30 22:42:58 +02:00
Alex Neundorf e8ae504c0e Add option CONFIG_MODE to FPHSA()
When this option is used for FPHSA(), it automatically handles the
information created by a preceding find_package(NO_MODULE) all and
creates a proper success/error message.

Alex
2010-08-29 19:53:43 +02:00
Alex Neundorf cc955a042b Small cleanup of FindPackageHandleStandardArgs.cmake
-remove unnecessary arguments _VAR1
-move code for deciding the type of the message into helper macro
 _FPHSA_FAILURE_MESSAGE()

Alex
2010-08-29 18:55:25 +02:00
Miguel A. Figueroa-Villanueva 6bbf2a0e8e ENH: #9775 Added support for new wxWidgets 2.9 libraries.
Added support for new libraries in wxWidgets 2.9 that are
part of the main distribution. These are: wxPropertyGrid,
wxSTC, wxScintilla, and wxRibbon.
2010-08-29 12:22:18 -04:00
Alex Neundorf 88e6447e19 Add macro ADD_FEATURE_INFO() and improve docs.
ADD_FEATURE_INFO() can be used to set the info for a feature,
e.g. an option().
set_feature_info() has been renamed to set_package_info(), since this is
about found or not found packages. For compatiblity set_feature_info()
is still provided.

Alex
2010-08-25 21:53:16 +02:00
David Cole 90add6b504 Refine formatting for cmake --help-module output.
Also refer to self as module, not script.
2010-08-25 14:58:31 -04:00
David Cole af0c719b9a Merge branch 'patches/docBundleUtilities'
of http://github.com/themiwi/CMake
into fix-10747

Conflicts:
	Modules/BundleUtilities.cmake

There was one newly added function in BundleUtilities.cmake
which also needed the same "documentation at top" treatment.
2010-08-25 14:54:14 -04:00
Alex Neundorf b35352464c Improve wording of the documentation.
Alex
2010-08-24 23:08:41 +02:00
Alex Neundorf 6fc88b26b6 Improve documentation.
Alex
2010-08-24 22:59:01 +02:00
Eric NOULARD 3178767d5f Merge 'CPack-FixDESTDIR-Issue7000' from github.com:TheErk/CMake 2010-08-24 21:59:13 +02:00
Alex Neundorf 33338781db Log the required package version and major improvement to FeatureSummary
find_package() now also stores the required version automatically, so it
can be used by FeatureSummary.cmake.
This was one of the requested features for setting up nightly builds
for KDE, since with this functionality it will be possible to write
a file at the end of each project which lists all required packages
and their versions. This file could then be compared for equality
with an older one and if something has changed the build maintainer
can be emailed.

In FeatureSummary.cmake there is now a new function feature_summary(),
which also allows to print the log to a file or into a variable.
It also allows to specify whether to append to a file or to write a new
one, and what information to log.

Docs are still missing.

Alex
2010-08-24 21:24:54 +02:00
Brad King d5e3e04a23 Merge topic 'add-ExternalProject-targets'
ef9dd49 Add STEP_TARGETS to ExternalProject module.
2010-08-24 14:46:06 -04:00
Brad King 612c0b68a0 Merge topic 'FixEclipseIncludePathParsingWithSpaces'
9fd4e18 Fix parsing of builtin macros so Eclipse handles them properly (#10868)
2010-08-24 14:42:07 -04:00
Clinton Stimpson 2756311a9a Make sure moc parameters file goes in binary directory.
Fix bug 11120.  Parameters files previously went into source
directory when qt4_generate_moc() was given relative paths.
Also simplified some logic for absolute paths.
2010-08-24 12:41:14 -06:00
David Cole ef9dd49d3d Add STEP_TARGETS to ExternalProject module.
This commit introduces the ability to add custom targets
that correspond to individual ExternalProject steps.
The main motivation behind this new feature is to drive
sub-project based dashboard steps as external projects
with separate targets for update, configure, build and
test output. This makes it easy to construct a ctest -S
script to drive such a dashboard.

With no STEP_TARGETS defined, there are no additional
custom targets introduced, to minimize the chatter in
the target name space. Clients may define STEP_TARGETS
on a per-ExternalProject_Add basis, or at the directory
level by setting the EP_STEP_TARGETS directory property.
2010-08-23 17:50:58 -04:00
Alex Neundorf 9fd4e1814b Fix parsing of builtin macros so Eclipse handles them properly (#10868)
Alex
2010-08-23 20:54:35 +02:00
Eric NOULARD 6a521f8604 CPack Enable better handling of absolute installed files
The idea of the patch is to let the install generator define
CPACK_ABSOLUTE_INSTALL_FILES then when CMake is installing
project he will concatenate the list of files and give
it to specific CPack Generator by defining CPACK_ABSOLUTE_INSTALL_FILES
to be the list of ALL files that were installed using absolute destination.
An example of use has been applied to RPM generator which now
tries to automatically build a relocatable package.
2010-08-23 17:38:33 +02:00
Philip Lowman 78289320dd 10688: FindGTK2.cmake doesn't auto-detect macports 2010-08-19 22:05:05 -04:00
Philip Lowman a53b47a77c 10241: FindBISON.cmake clears wrong variable 2010-08-19 21:50:31 -04:00
Philip Lowman ed78a72a9b 11041: Improve FindCxxTest to use Python or Perl automatically; custom flags
Included patch by Simone Rossetto to check if either Python or Perl
are present in the system.  Whichever intepreter that is detected
is now used to run the test generator program.  If both interpreters
are detected, the CXXTEST_USE_PYTHON variable is obeyed.

Also added support for CXXTEST_TESTGEN_ARGS, for manually specifying
options to the CxxTest code generator.
2010-08-19 21:44:44 -04:00
Brad King 0ea9d650f7 Merge topic 'msvc-version'
76ed7f0 Set MSVC_VERSION for MSVC 6, 7, 7.1 (#7944)
2010-08-19 13:26:59 -04:00
Brad King 0596f0ce78 Merge topic 'FortranCInterface-doc-typo'
e872f5d FortranCInterface: Fix doc typo FC.h -> FCMangle.h
2010-08-19 13:26:45 -04:00
Brad King 8ccfc5e24d Merge topic 'TimeoutForExecuteProcessInVendorChecking'
e6c9bc2 Add timeout to execute_process() in CMAKE_DETERMINE_COMPILER_ID().
2010-08-19 13:26:07 -04:00
Brad King 9487612590 Merge topic 'CMakeParseArguments'
c327cbd Modules: Fix CMakeParseArguments copyright notice
9eb6cc1 Merge branch 'module-notices' into CMakeParseArguments
b173b87 Add macro CMakeParseArguments() and use it in FPHSA()
2010-08-19 13:23:02 -04:00
Rolf Eike Beer 76ed7f0556 Set MSVC_VERSION for MSVC 6, 7, 7.1 (#7944) 2010-08-17 18:02:30 -04:00
Brad King e872f5d70a FortranCInterface: Fix doc typo FC.h -> FCMangle.h 2010-08-17 16:43:20 -04:00
Alex Neundorf e6c9bc267b Add timeout to execute_process() in CMAKE_DETERMINE_COMPILER_ID().
In CMAKE_DETERMINE_COMPILER_ID_VENDOR() the compiler is called with various
arguments. In some cases, this can make the compiler hang and wait
forever for input (e.g. "as -v"). That's why add an timeout
so it terminates finally. 10 seconds should be more than enough,
this is the time it takes to startup the compiler, which is
usually quite fast.

Alex
2010-08-17 21:40:45 +02:00
Brad King 30f676c75f Merge topic 'ImproveAsmCompilerIDDetection'
b333779 Detect a COMPILER_ID also for ASM.
691fc2b Remove trailing spaces
2010-08-17 15:19:49 -04:00
Brad King 9e9d23fe0f Merge topic 'FixEclipseIncludePathParsingWithSpaces'
cac6edc Fix EclipseCDT parsing of builtin macros with spaces (#10868)
8102dc3 Fix EclipseCDT include path parsing with spaces (#10868)
2010-08-17 15:17:29 -04:00
Brad King 8f4cc1eb2b Merge topic 'FixZLIBVersion'
75e7278 Fix ZLIB version parsing if no TWEAK version exists
2010-08-17 15:16:47 -04:00
Brad King a890f6a00b Merge topic 'FixSubversionDoc'
3e126e4 Change documentation of Subversion_FOUND and SUBVERSION_FOUND.
2010-08-17 15:16:01 -04:00
Brad King 79383cfd97 Merge topic 'fix-issue-11035'
d570ee7 Fix 11035 : debug/release library configuration mistake
2010-08-17 15:15:30 -04:00
Brad King 69252437ef Merge topic 'python_add_module_scope'
42fd9a5 Bug with default library type of Python modules.
2010-08-17 15:15:04 -04:00
Brad King da6fc97f19 Merge topic 'tg/BlueGeneP'
7083c81 Add platform files for BlueGene/P systems
2010-08-17 15:14:07 -04:00
Brad King 57c5bf5b18 Merge topic 'FindGTK2_fixes'
f6ca76f Several fixes needed to improve Windows support
74a12f3 Add detection for new pangommconfig.h header file
2010-08-17 15:10:48 -04:00
Brad King 164a8568f1 Merge topic 'improve-cpack-docs'
cf4a50b Add documentation for CPACK_PROJECT_CONFIG_FILE.
2010-08-17 15:10:05 -04:00
Brad King 4d8f0c2974 Merge topic 'FindBoost_cygwin_fix'
8de0d1a Fixes problem finding libraries under Boost (#9510)
2010-08-17 15:09:45 -04:00
Brad King 32ebe21ad8 Merge topic 'intel-response-files'
4b1e5f0 Pass objects to Intel linker using a response file
2010-08-17 15:09:12 -04:00
Brad King c327cbdfef Modules: Fix CMakeParseArguments copyright notice
Fix format of the copyright notice to pass the ModuleNoticesTest.
2010-08-17 09:44:30 -04:00
Alex Neundorf b333779e34 Detect a COMPILER_ID also for ASM.
For assembler, the "compiler ID" cannot be detected by "compiling" a
source file, since there is not source file all assemblers understand.
Instead the function CMAKE_DETERMINE_COMPILER_ID_VENDOR() is used to
run the assembler and check its output.
For this the CMAKE_DETERMINE_COMPILER_ID_VENDOR() function had to be
extended so that it creates the run directory if it doesn't exist yet.

In CMakeASMInformation.cmake now also CMAKE_ASM_COMPILER_ID is used
(but there are no such files yet, will come with the support for the
IAR toolchain).

Alex
2010-08-15 16:36:38 +02:00
Alex Neundorf 691fc2baa8 Remove trailing spaces
Alex
2010-08-15 16:08:54 +02:00
Alex Neundorf cac6edcad9 Fix EclipseCDT parsing of builtin macros with spaces (#10868)
Patch from dnewmarch

Alex
2010-08-15 15:15:12 +02:00
Alex Neundorf 8102dc32a3 Fix EclipseCDT include path parsing with spaces (#10868)
Alex
2010-08-15 14:59:16 +02:00
Alex Neundorf 75e727855a Fix ZLIB version parsing if no TWEAK version exists
ZLIB_VERSION_STRING was "1.2.3.#define ZLIB_VERSION "1.2.3"" here, because
the result of the matching for the tweak version was also appended if there
was no TWEAK version and the regexp failed, which gives as result not
an empty string, but the full string.
Now it is only appended if the regexp matches.

Alex
2010-08-14 22:16:06 +02:00
Alex Neundorf b173b879f8 Add macro CMakeParseArguments() and use it in FPHSA()
This adds a macro cmake_parse_arguments() (as discussed on cmake-devel)
which can be used in macros or functions to help with parsing its
arguments. Detailled docs are included.
find_package_handle_standard_args() is the first user of this new macro.

Alex
2010-08-14 22:06:49 +02:00
Alex Neundorf 3e126e45bc Change documentation of Subversion_FOUND and SUBVERSION_FOUND.
As discussed on cmake-devel, here Subversion_FOUND is the recommended one.

Alex
2010-08-14 21:25:22 +02:00
Mathieu Malaterre d570ee7b5a Fix 11035 : debug/release library configuration mistake
Thanks to Dimitri Kaparis for report
2010-08-14 13:18:31 +02:00
Marcus D. Hanwell 42fd9a596f Bug with default library type of Python modules.
The _TARGET_SUPPORTS_SHARED_LIBS variable was being altered outside of
the find module, moving it into the function fixes any of these scoping
issues. Fix tested and verified in VTK and Titan.
2010-08-13 14:49:29 -04:00
Todd Gamblin 7083c81db7 Add platform files for BlueGene/P systems
BlueGeneP-base:    Internal base shared by static and dynamic files
BlueGeneP-static:  Platform file for all-static builds
BlueGeneP-dynamic: Platform file for "default" dynamic builds
2010-08-13 12:17:57 -04:00
Philip Lowman f6ca76f195 Several fixes needed to improve Windows support
* Add support for detecting fontconfig.h header
* Call find_package(Freetype) since it's required
* Add support for allowing users to add additional library directories
  via the GTK2_ADDITIONAL_SUFFIXES variable (kind of a future-kludge in
  case the GTK developers change versions on any of the directories in the
  future).
* Fixed a problem on Windows where you had to configure twice to find
  the gtk & gdk libraries
2010-08-12 01:45:19 -04:00
Philip Lowman 74a12f3042 Add detection for new pangommconfig.h header file
Thanks to Sune Vuorela & the Debian Project for the patch
http://git.debian.org/?p=collab-maint/cmake.git;a=commitdiff;h=5dc3acd7
2010-08-12 01:38:31 -04:00
David Cole cf4a50bcdb Add documentation for CPACK_PROJECT_CONFIG_FILE. 2010-08-11 11:40:11 -04:00
Philip Lowman 8de0d1a8ca Fixes problem finding libraries under Boost (#9510) 2010-08-10 22:05:17 -04:00
Brad King 74805b28c1 Merge topic 'ImprovedVersionCheckingInSomeModules'
430336c Merge branch 'findsubversion_fphsa_cleanup'
b6c6156 Use FPHSA() in FindSWIG, including version checking.
656cd2f Improved version checking for FindCUDA using the new mode of FPHSA
126db7b Improved version checking for FindSubversion using the new mode of FPHSA()
77d909b Fix DETAILS string with version number in FHPSA()
19b68b9 Improved version checking for FindJava using the new FPHSA() mode
6bb0b6e Improved version checking for FindRuby using the new mode of FPHSA()
946493f FindSquish doesn't detect the version, remove that from the documentation
cb9d1ea Add version checking support to FindFlex and FindPerlLibs
2010-08-10 14:51:45 -04:00
Brad King 430336c5e1 Merge branch 'findsubversion_fphsa_cleanup'
into ImprovedVersionCheckingInSomeModules

Conflicts:
	Modules/FindSubversion.cmake
2010-08-10 14:50:00 -04:00
Brad King cc31f89c17 Merge topic 'module-header-spelling'
2cde67a Modules: Fix spelling 'To distributed' -> 'To distribute'
2010-08-10 14:33:47 -04:00
Brad King 4b432328a2 Merge topic 'mingw-response-files'
b03f4ec No response files with GNU ld <= 2.16 (#10913)
2010-08-10 14:33:01 -04:00
Brad King fab51e6f8d Merge topic 'findsubversion_fphsa_cleanup'
a918bd5 FindSubversion: set compatibility variables based on FPHSA()
2010-08-10 14:32:19 -04:00
Brad King ab994bfe88 Merge topic 'findzlib_use_fphsa'
5f183ca FindZLIB: use the FPHSA version mode
2010-08-10 14:31:26 -04:00
Brad King 499e1c9598 Merge topic 'find-boost'
187e969 FindBoost: Search for Boost 1.43 and 1.44
2fec615 FindBoost: Search for Boost 1.42
2010-08-10 14:30:35 -04:00
Arjen Verweij 4b1e5f0152 Pass objects to Intel linker using a response file
Use response files for C and CXX languages with the Intel compiler on
Windows.  We already used them for Fortran.  This enables creation of
libraries and executables with a very large number of object files.
2010-08-10 09:34:12 -04:00
Todd Gamblin 2cde67a781 Modules: Fix spelling 'To distributed' -> 'To distribute' 2010-08-09 08:48:31 -04:00
Alex Neundorf b6c61561d6 Use FPHSA() in FindSWIG, including version checking.
Alex
2010-08-07 23:18:17 +02:00
Alex Neundorf 656cd2fad2 Improved version checking for FindCUDA using the new mode of FPHSA
Alex
2010-08-07 23:09:14 +02:00
Alex Neundorf 126db7b060 Improved version checking for FindSubversion using the new mode of FPHSA()
Alex
2010-08-07 23:00:31 +02:00
Alex Neundorf 77d909b559 Fix DETAILS string with version number in FHPSA()
If found, the version which was found should be stored in the DETAILS
string, but it was dereferenced twice, which was wrong.

Alex
2010-08-07 22:30:06 +02:00
Alex Neundorf 19b68b9fae Improved version checking for FindJava using the new FPHSA() mode
Alex
2010-08-07 22:29:08 +02:00
Alex Neundorf 6bb0b6e915 Improved version checking for FindRuby using the new mode of FPHSA()
Alex
2010-08-07 22:08:51 +02:00
Alex Neundorf 946493faa8 FindSquish doesn't detect the version, remove that from the documentation
Alex
2010-08-07 22:02:57 +02:00
Alex Neundorf cb9d1eaca4 Add version checking support to FindFlex and FindPerlLibs
Use the new mode of FPHSA() to add version checking for these two modules.

Alex
2010-08-07 22:01:44 +02:00
Brad King b03f4ec09d No response files with GNU ld <= 2.16 (#10913)
Older GNU ld does not support the @FILE syntax for response files.
Check the ld version on MinGW and MSYS before enabling the syntax.
2010-08-06 09:34:53 -04:00
Kovarththanan Rajaratnam a918bd5264 FindSubversion: set compatibility variables based on FPHSA() 2010-08-04 08:51:55 +02:00
Kovarththanan Rajaratnam 5f183caa7c FindZLIB: use the FPHSA version mode
Remove our implementation of version checking and instead use FPHSA()
2010-08-04 08:18:05 +02:00
Brad King 187e96990c FindBoost: Search for Boost 1.43 and 1.44
The current release is 1.43 and the next release will be 1.44.
2010-08-03 16:32:09 -04:00
Brad King 7e578b8d73 Merge topic 'ExternalProject-cygwin-make'
ed43ea6 ExternalProject: Fix $(MAKE) with cygpath on Windows
2010-08-03 16:21:55 -04:00
Brad King a1b9388bc3 Merge topic 'find_cygwin17'
462fa2d FindCygwin: add new registry entry for Cygwin 1.7 (#10951)
2010-08-03 16:19:05 -04:00
Brad King 976aaf45de Merge topic 'findzlib_fix_version'
6b9b9f4 FindZLIB: optimize zlib.h version parsing
2010-08-03 16:18:42 -04:00
Brad King cbfc37dc18 Merge topic 'fix-issue-9611'
963921f BUG: 0009611 Fix Arch independent FindJNI.cmake on Linux
2010-08-03 16:16:36 -04:00
Brad King 16dcaced74 Merge topic 'AddVersionChecking2FindPackageHandleStandardArgs'
d016468 -fix indentation of the documentation
d358cf5 add 2nd, more powerful mode to find_package_handle_standard_args()
2010-08-03 16:15:59 -04:00
Brad King 8c8aa7e8f6 Merge topic 'hurd-platform'
90467d6 GNU/Hurd platform support fixes (#9873)
2010-08-03 16:14:08 -04:00
Brad King 84394bcbea Merge topic 'find-libarchive'
a602f87 Add option CMAKE_USE_SYSTEM_LIBARCHIVE (#10923)
9e903b9 Add FindLibArchive module (#10923)
2010-08-03 16:13:25 -04:00
Brad King 1820a05cb2 Merge topic 'CPackDEB-auto-dependency-support'
ded3a15 CPackDeb  optionally generates auto-dependency list part fix of bug 10292
2010-08-03 16:12:37 -04:00
Brad King 68efc3ef86 Merge topic 'fix-issue-11034'
9fa49dc ExternalProject: Remove 'unknown keyword' warning (#11034)
2010-08-03 16:11:01 -04:00
Brad King dac2afec25 Merge topic 'FixTypoInMacroAddFileDependencies'
44ae8bd -fix typo in docs of deprecated MacroAddFileDependencies.cmake
2010-08-03 16:10:06 -04:00
Brad King df54303065 Merge topic 'AdditionalLibTiffName'
14dfdc3 -add an additional name for finding libtiff on Windows
2010-08-03 16:09:44 -04:00
Brad King 70a8e10495 Merge topic 'findopenssl-path-fix'
ca5c522 Add missing PATHS to find_path commands to fix openssl searching
2010-08-03 16:08:39 -04:00
Brad King eb6d6a3708 Merge topic 'fix-issue-10020'
979972f Copy Resources in Frameworks during fixup_bundle (#10020)
2010-08-03 16:07:54 -04:00
Brad King ed43ea603f ExternalProject: Fix $(MAKE) with cygpath on Windows
In non-cygwin builds using Cygwin's make tool, use cygpath to transform
the value of $(MAKE) to something Windows understands.
2010-08-02 12:02:15 -04:00
Clinton Stimpson 35b91ac5c0 Fix regex for moc includes when looking for frameworks. 2010-08-02 09:39:02 -06:00
Kovarththanan Rajaratnam 462fa2d185 FindCygwin: add new registry entry for Cygwin 1.7 (#10951)
This patch adds support for Cygwin 1.7 which uses a new registry entry

Patch by Fabrice Aeschbacher
2010-07-31 07:51:00 +02:00
Kovarththanan Rajaratnam 6b9b9f44c8 FindZLIB: optimize zlib.h version parsing
Read zlib.h by using file(STRINGS.....REGEX) to limit the amount of text we apply the version regex on. This patch also addresses the fact that the version string may contain a tweak component.

Patch by Simone Rossetto
2010-07-31 07:24:47 +02:00
Mathieu Malaterre 963921f2a8 BUG: 0009611 Fix Arch independent FindJNI.cmake on Linux 2010-07-30 10:19:42 +02:00
Alex Neundorf d016468e9c -fix indentation of the documentation
Alex
2010-07-29 19:09:59 +02:00
Pino Toscano 90467d6294 GNU/Hurd platform support fixes (#9873)
Define use of -rpath-link and --export-dynamic flags.  The toolchain on
Hurd is GNU-based so we can use the values from Linux.
2010-07-29 10:43:03 -04:00
Brad King 9e903b9f0e Add FindLibArchive module (#10923) 2010-07-29 10:13:25 -04:00
Alex Neundorf d358cf5cc4 add 2nd, more powerful mode to find_package_handle_standard_args()
This additional mode also supports version checking and should be
easily extendible, e.g. for COMPONENT stuff.
Updated FindBISON.cmake as first user of this new mode.
Docs updated.

Alex
2010-07-29 00:09:14 +02:00
Eric NOULARD ded3a1585b CPackDeb optionally generates auto-dependency list part fix of bug 10292
The default behavior is not to activate this option because it may break
DEB package building for project who does not use INSTALL RPATH.
2010-07-28 18:24:20 +02:00
Brad King 2fec615852 FindBoost: Search for Boost 1.42 2010-07-28 10:29:40 -04:00
David Cole 9fa49dc3ad ExternalProject: Remove 'unknown keyword' warning (#11034)
The intent was to warn about misspelled keyword arguments,
but the effect was to warn about valid argument values far
too often. Let's stop annoying and confusing people.
2010-07-28 08:16:08 -04:00
Alex Neundorf 44ae8bd9ee -fix typo in docs of deprecated MacroAddFileDependencies.cmake
Patch on the mailing list by Serge Ziryukin.

Alex
2010-07-27 22:47:18 +02:00
Alex Neundorf 14dfdc3e42 -add an additional name for finding libtiff on Windows
libtiff also exists as tiff.dll/lib under Windows, patch from
Patrick Spendrin (#10942)

Alex
2010-07-27 22:33:34 +02:00
Mathieu Malaterre ca5c5221b7 Add missing PATHS to find_path commands to fix openssl searching 2010-07-27 18:26:55 +02:00
David Cole 979972f988 Copy Resources in Frameworks during fixup_bundle (#10020)
By default, if an embedded item is a framework, copy its
main dylib file explicitly, and then also its Resources
if it has any.

Inspect a variable, BU_COPY_FULL_FRAMEWORK_CONTENTS, and
if it's ON, copy the entire framework into the bundle.
2010-07-27 12:25:11 -04:00
David Cole b62fe1242f ExternalProject: Use $(MAKE) whenever possible.
ExternalProject_Add calls that did not explicitly request a
CMAKE_GENERATOR would not get recursive parallel make behavior.
This commit fixes that issue.
2010-07-23 13:51:37 -04:00
Brad King 946798f405 Merge topic 'findqt4-cross-compile'
c019427 Fix mingw/VS warning message with cross compile re-org.
2010-07-20 16:00:59 -04:00
Brad King e1a4c02bac Merge topic 'resolve/doc-spelling/CPackRPM'
7739d78 Merge CPackRPM changes into doc-spelling
9203e91 Fix spelling errors reported by Lintian.
2010-07-20 16:00:29 -04:00
Clinton Stimpson c0194278ac Fix mingw/VS warning message with cross compile re-org. 2010-07-15 10:23:32 -06:00
Brad King f7a0386fc5 Merge topic 'resolve/ctest-file-checksum/remove-CTestTest3'
38c762c Merge 'remove-CTestTest3' into ctest-file-checksum
46df0b4 Activate retry code on any curl submit failure.
8705497 Checksum test should use CMAKE_TESTS_CDASH_SERVER
d0d1cdd Mock checksum failure output for old CDash versions
af5ef0c Testing for CTest checksum
86e81b5 CTest should resubmit in the checksum failed case
d6b7107 Fix subscript out of range crash
082c87e Cross-platform fixes for checksum/retry code
e525649 Checksums on CTest submit files, and retry timed out submissions.
2010-07-13 17:05:33 -04:00
Brad King 38c762c728 Merge 'remove-CTestTest3' into ctest-file-checksum
Conflicts:
	Tests/CMakeLists.txt
2010-07-13 17:01:39 -04:00
Brad King a570ba6df7 Merge topic 'external-project-launcher'
b2634b6 Detect CMake warnings and errors in build output.
012c986 ExternalProject: Add LOG_* options to hide step output
2010-07-13 14:58:11 -04:00
Brad King 36f82f06b7 Merge topic 'CPackRPM-RelocatablePackage'
604c369 CPackRPM:: [partially] support relocatable package
2010-07-13 14:54:09 -04:00
Brad King edbaf90a02 Merge topic 'FindPostgreSQL'
56da481 Changed ADDITIONAL_SEARCH_PATHS to PostgreSQL_ADDITIONAL_SEARCH_PATHS.
106de67 Forgot the copyright notice.
5ecfe16 Adding a FindPostgreSQL.cmake module
2010-07-13 14:52:34 -04:00
Brad King 8212d90cb5 Merge topic 'findqt4-cross-compile'
7fd3739 Find correct Qt plugins for cross-compiling.
ff888dd Fix some issues with refinding when qmake executable is changed.
22e725f Tweak for cygwin, don't convert : to ;
b55da4c Add cross-compiling support to FindQt4.cmake
2010-07-13 14:48:24 -04:00
Brad King 7739d786a4 Merge CPackRPM changes into doc-spelling
Conflicts:
	Modules/CPackRPM.cmake
2010-07-13 09:46:52 -04:00
Kai Wasserbäch 9203e9187e Fix spelling errors reported by Lintian.
During a Lintian run on the binary packages of CMake in Debian I was
notified of many spelling mistakes.
2010-07-13 09:41:37 -04:00
David Cole b2634b6aa3 Detect CMake warnings and errors in build output.
Fix niggly in ExternalProject that would inadvertently
create a log file of output when a command was explicitly
set to the empty string.

Also, increase the default value for showing context
around build errors to 10 lines, up from 6. Also add
the ability to customize this setting so that users
can put it back to 6 or even lower if they want, or
show more if they want.
2010-07-10 15:04:31 -04:00
Eric NOULARD 604c3698c1 CPackRPM:: [partially] support relocatable package
The support is partial because it cannot be used if
   CPACK_SET_DESTDIR is set
   some file are installed using absolute path
2010-07-09 20:01:57 +02:00
Andrew Maclean 56da481eff Changed ADDITIONAL_SEARCH_PATHS to PostgreSQL_ADDITIONAL_SEARCH_PATHS. 2010-07-09 15:30:21 +10:00
Andrew Maclean 106de6785a Forgot the copyright notice. 2010-07-08 10:24:52 +10:00
Andrew Maclean 5ecfe168dc Adding a FindPostgreSQL.cmake module 2010-07-08 09:49:15 +10:00
Clinton Stimpson 7fd3739ce7 Find correct Qt plugins for cross-compiling. 2010-07-06 14:37:16 -06:00
Clinton Stimpson ff888dd648 Fix some issues with refinding when qmake executable is changed. 2010-07-06 13:24:53 -06:00
Brad King 48ac8180db Merge branch 'CPackRPM-handleFileWithSpace' 2010-07-06 10:30:30 -04:00
Brad King bf3abc592e Merge branch 'CPackRPM-VariousEnhancement-0010741' 2010-07-06 10:29:48 -04:00
Brad King 9fbf64445d Merge branch 'CPackRPM-fixDashInRPMVersion' 2010-07-06 10:28:32 -04:00
Brad King f315c29966 Merge branch 'FindMPI-flag-parsing' 2010-07-06 10:19:48 -04:00
Eric NOULARD 6926e9114c CPackRPM:: Quote every filenames in %file section (see bugs 10701,10871,10345) 2010-07-04 15:08:17 +02:00
Eric NOULARD c29cf0e1d2 Provides default changelog if no file is provided 2010-07-04 12:27:47 +02:00
Eric NOULARD 7486396e5b CPackRPM:: Replace - with _ in RPM Version (fix bug 0010934) 2010-07-04 11:43:33 +02:00
Rolf Eike Beer dbe7525c6e clean up some stuff in CPack RPM script
-remove trailing whitespace
-fix description of CPACK_RPM_PACKAGE_SUMMARY
-fix description of CPACK_RPM_PACKAGE_VENDOR
-fix description of CPACK_RPM_PACKAGE_PROVIDES
-do not put changelog of that file to generated RPM but read it from CPACK_RPM_CHANGELOG_FILE
-add CPACK_RPM_PACKAGE_URL
-add CPACK_RPM_PACKAGE_OBSOLETES
-add CPACK_RPM_PACKAGE_SUGGESTS
-add a loop so adding more user supplied header fields is easy

Signed-off-by: Eric NOULARD <eric.noulard@gmail.com>
2010-07-04 11:11:52 +02:00
Clinton Stimpson 22e725fb88 Tweak for cygwin, don't convert : to ; 2010-07-03 08:58:25 -06:00
Clinton Stimpson b55da4c688 Add cross-compiling support to FindQt4.cmake 2010-07-02 15:47:07 -06:00
Brad King 6a04cfd359 Merge branch 'FindMPI-BlueGene-L' 2010-06-29 14:37:21 -04:00
Brad King 7adbcf672f Merge branch 'qt4-configdeps-standardmodules' 2010-06-29 14:31:14 -04:00
Brad King 51dd5d8122 Merge branch 'getprerequisites-bug10418' 2010-06-29 14:28:21 -04:00
Brad King 96c7cb26e9 FindMPI: Fix parsing of mpicc -Wl,-L link flags (#9093)
Commit d84cbd0f (FindMPI: Parse mpicc flags more carefully, 2010-06-24)
broke parsing of '-L' flags appearing after '-Wl,' by expecting a
preceding space.  Update the regular expression to allow '-Wl,-L' too.
2010-06-29 10:59:52 -04:00
Brad King cea9389cc9 FindMPI: Trust mpicc -showme on BlueGene/L
Do not hard-code known BlueGene/L MPI libraries.  We do not know their
location so the linker cannot find them without the proper -L search
path.  The MPI compiler tells us about the libraries anyway, and if it
does not then the user can fix the problem locally by editing the
MPI_EXTRA_LIBRARY cache entry.
2010-06-28 11:42:34 -04:00
Brad King 8460059a72 FindMPI: Failure is not an error if not REQUIRED 2010-06-28 11:35:18 -04:00
Clinton Stimpson 2aa515db9e Change Qt4ConfigDependentSettings to use more standard find modules.
Let's use more standard find modules for Qt4 dependencies.  Move a few
from using pkg-config so we can do cross compiling the cmake way.
2010-06-25 13:15:10 -06:00
Brad King d84cbd0f77 FindMPI: Parse mpicc flags more carefully (#9093)
Extend the fix from commit 68c7d3e2 (FindMPI: Do not parse -l in middle
of library name, 2010-06-24).  Parse -D, -I, -L, and -Wl only with
preceding spaces or at the beginning of the string.
2010-06-25 08:00:38 -04:00
Clinton Stimpson 9306f1beee Fix regression in 5e6634fd77969433a87c150a2fb3f2079131484f for Windows. 2010-06-24 11:15:00 -06:00
Clinton Stimpson e6f8a86368 Fix bug 10418 - GetPrerequisites returning "not" as a dependency.
ldd can return "not found" and we need to handle it correctly.
In that case, we extract only the name of the library instead of trying for its full path.
2010-06-24 11:15:00 -06:00
Clinton Stimpson 5850b8b79a Fix performance issue with getting version from zlib.h
Some zlib.h files have ZLIB_VERSION "1.2.3.3" with 4 numbers instead of 3.
The regex is changed to grab the first 3 numbers.
It was slow because if it failed to find that string near the top of the file,
where it usually is, it would read the entire file.
2010-06-24 10:52:37 -06:00
Brad King 68c7d3e2ce FindMPI: Do not parse -l in middle of library name
We parse the output of 'mpicc -shome:link' to look for -l options
specifying libraries.  Fix the parsing regex to avoid matching the
string '-l' in the middle of a library name.
2010-06-24 11:07:19 -04:00
Brad King ec10d005ce Merge branch 'findopenssl-win64' 2010-06-24 10:46:09 -04:00
Brad King 4ac531487b Merge branch 'CudaRTEmuLibraryForCUDA30' 2010-06-24 10:43:05 -04:00
David Cole 67f4759b55 Qualify name of extraction location with ExternalProject name.
Avoid issues with two external projects trying to extract two
separate trees at the same time into the same location. Should
fix the sporadically failing ExternalProject test on the dashboards
for parallel builds.
2010-06-23 07:04:06 -04:00
Mathieu Malaterre fb1eb141b5 Apply patch from B. King on ML 2010-06-22 17:11:39 +02:00
Brad King d39ffaa261 Merge branch 'finddcmtk' 2010-06-22 10:03:29 -04:00
Brad King 84fd223aee Merge branch 'remove-bad-paths-from-CMakeVSFind-modules' 2010-06-22 09:58:26 -04:00
Brad King 22301dd9e7 Merge branch 'FixCudaVersionAfterFirstRun' 2010-06-22 09:57:29 -04:00
James Bigler bb6acb8667 Add support for the emulation version of the cudart library.
In version 3.0 of the CUDA toolkit when building code for emulation, you need to link
against a new version of the cuda run time library called cudartemu.  This CL adds a check
for the new library and uses it when present and in emulation mode.  Note that this
library is not present in previous or subsequent versions of the CUDA toolkit.
2010-06-21 17:11:57 -06:00
Brad King 012c986309 ExternalProject: Add LOG_* options to hide step output
Optionally hide the output of each external project build step by
wrapping its command in a launcher script.  Make output available in log
files instead.  This simplifies the output of external project builds.
2010-06-21 13:25:13 -04:00
David Cole 682b4fdcaf Remove "Microsoft Visual Studio .NET" from VS8 and VS9 find modules.
CMake was incorrectly finding devenv from Visual Studio 7.1 installations
when asked to generate using Visual Studio 9 2008. Now, it will not.
2010-06-16 12:14:18 -04:00
Brad King b4aa834900 Merge branch 'ctest-git-flexibility' 2010-06-15 14:10:41 -04:00
Brad King 1a759b7d05 Merge branch 'remove-qmake-query' 2010-06-15 14:05:49 -04:00
Brad King 520b760c80 Merge branch 'findthreads-irix' 2010-06-15 14:05:40 -04:00
Brad King 5444bd6ca3 Merge branch 'tru64-make-includes' 2010-06-15 14:03:26 -04:00
Brad King 7c9f39d4ba Merge branch 'fix-issue-10346' 2010-06-15 14:02:11 -04:00
Brad King d9b2da139d Merge branch 'mingw-response-files' 2010-06-15 13:58:58 -04:00
James Bigler 1d5554201f CUDA_VERSION variable passed to REGEX needs quotes to work when not defined. 2010-06-15 10:03:40 -06:00
Mathieu Malaterre b3cb794fec Cleanup FindOpenSSL. Add support for win64 installation. 2010-06-15 10:33:58 +02:00
Mathieu Malaterre b9e227af84 Cleanup FindDCMTK (using foreach). Fix linking on win32 static libs. 2010-06-15 09:51:14 +02:00
Brad King c592df8377 Tru64: Use full-path include directives in Makefiles (#10569)
Tru64's make(1) resolves relative paths in "include" directives with
respect to the includer.  This is inconsistent with all other known make
tools.  Note that this make tool treats the path literally so we cannot
use our standard FULL path code which escapes spaces.  Instead qualify
the paths with $(CMAKE_BINARY_DIR) to avoid the problem.
2010-06-14 13:06:39 -04:00
Clinton Stimpson 1f608718fc Remove macro for querying qmake for qmake variables.
Remove last place for querying qmake values.
Also removed internal macro to support querying qmake.
Depends on findthreads-irix topic.
2010-06-12 13:00:08 -06:00
Clinton Stimpson d09664a4d4 Support pthreads on irix. 2010-06-11 18:10:38 -06:00
David Cole cd3d60b8b5 Fix issue #10346. Error if SOURCE_DIR is empty.
See http://public.kitware.com/Bug/view.php?id=10346.
The proposed patch for the issue could not be applied as is
because the SOURCE_DIR always exists for an ExternalProject_Add
call by the time we get to the place to emit the potential error.

The fix is to emit the error only if the source dir is empty.
By which, I mean devoid of files and subdirectories. If
SOURCE_DIR is used by itself, without any DOWNLOAD_COMMAND
or repository info, then it implies that the SOURCE_DIR is ready
to build as-is without need for a download step. Clearly, if it
is empty, then it is not ready to build as is. So complain if
the SOURCE_DIR is empty.
2010-06-09 18:22:58 -04:00
Brad King 2eae651acc ctest_update: Support custom Git update command
Define CTest configuration variable CTEST_GIT_UPDATE_CUSTOM to set a
custom command line for updating Git-managed source trees.
2010-06-08 16:12:28 -04:00
Brad King 6f9bb934d4 Merge branch 'sunCC-5.11-rpath-link' 2010-06-08 09:23:11 -04:00
Brad King 6cf1ccd632 Merge branch 'per-config-link-flags' 2010-06-07 14:36:28 -04:00
Brad King ec66c9db8c Merge branch 'cygwin-exe-export-all' 2010-06-07 14:30:21 -04:00
Brad King 0d07e4379e Merge branch 'improve-file-download'
Conflicts:
	Modules/ExternalProject.cmake
2010-06-07 14:26:24 -04:00
Brad King a03e85f13c Merge branch 'add-git-to-ExternalProject'
Conflicts:
	Modules/ExternalProject.cmake
2010-06-07 14:23:45 -04:00
Brad King 79f01660c9 Merge branch 'more-formats-in-ExternalProject' 2010-06-07 14:22:26 -04:00
Brad King 33b59ee8dd Merge branch 'use-rename-not-copy-ExternalProject' 2010-06-07 14:22:02 -04:00
Brad King 2bc82e07bd Merge branch 'ExternalProject-fixes' 2010-06-07 14:21:49 -04:00
Brad King ba38f0925c Merge branch 'add-svn-user-to-ExternalProject' 2010-06-07 14:21:43 -04:00
Brad King 693f98c105 Fix rpath-link flag for SunPro C++ 5.11 on Linux
Commit 82c081ba (Fix rpath-link flag for SunPro C++ on Linux,
2009-07-13) taught CMake to pass '-rpath-link' because SunPro C++ 5.9
does not support '-Wl,'.  Now SunPro C++ 5.11 does not recognize the
option without using '-Wl,'.  Detect whether to use '-Wl,' based on the
output of "sunCC -flags".
2010-06-07 10:15:58 -04:00
David Cole 29383b4b85 Add FindGit module.
Use it from ExternalProject and the ExternalProject test's
CMakeLists file rather than having duplicate find_program calls.
Add logic so that we do not try to use *.cmd variants of git
programs when using the MSYS Makefiles generator. Should fix
the last remaining dashboard issue with the new ExternalProject
git support additions.

Also, correct minor problem regarding placement of the local git
repo during test execution. On clean builds, it was being placed
incorrectly because of the ../.. relative reference. Use an absolute
path to place the local git repo in the proper directory, and only
use the relative reference when referring to it.
2010-06-03 17:30:07 -04:00
Zach Mullen 082c87e528 Cross-platform fixes for checksum/retry code 2010-06-03 13:27:26 -04:00
Zach Mullen e525649a4e Checksums on CTest submit files, and retry timed out submissions. 2010-06-03 10:34:34 -04:00
David Cole 670e16af2d Add git support to ExternalProject.
Requires at least version 1.6.5 of a git client for
git submodule update --recursive use.
2010-06-02 16:28:04 -04:00
Brad King 9622fe5e9a Watcom: Use LINK_FLAGS and STATIC_LIBRARY_FLAGS
Add the <LINK_FLAGS> rule variable in Watcom command lines.
2010-06-01 14:40:28 -04:00
David Cole 2deba1b911 Add .zip and .tar.bz2 extraction to ExternalProject.
Add archives of these file types and add to the test
cases covered in the ExternalProject test.

Also add an "Example" directory in the Tests/ExternalProject
directory containing the canonical simplest example of
ExternalProject usage.
2010-05-31 14:30:22 -04:00
Yaakov Selkowitz cd3a4f0025 Cygwin: Export all symbols with ENABLE_EXPORTS
The ENABLE_EXPORTS property exports all symbols from executables on
UNIX-like platforms, typically for use by plugins.  Honor this behavior
on Cygwin.  See issue #10122.
2010-05-27 14:41:38 -04:00
David Cole f67139ae6f Improve FILE(DOWNLOAD) and ExternalProject.
Improve FILE(DOWNLOAD ...):

- Add percent complete progress output to the FILE DOWNLOAD
  command. This progress output is off by default to
  preserve existing behavior. To turn it on, pass
  SHOW_PROGRESS as an argument.

- Add EXPECTED_MD5 argument. Verify that the downloaded
  file has the expected md5 sum after download is complete.

- Add documentation for SHOW_PROGRESS and EXPECTED_MD5.

  When the destination file exists already and has the
  expected md5 sum, then do not bother re-downloading
  the file. ("Short circuit" return.)

  Also, add a test that checks for the status output
  indicating that the short circuit behavior is actually
  occurring. Use a binary file for the test so that the
  md5 sum is guaranteed to be the same on all platforms
  regardless of "shifting text file line ending" issues.

Improve ExternalProject:

- Add argument URL_MD5.

- Add verify step that compares md5 sum of .tar.gz file
  before extracting it.

- Add md5 check to download step, too, to prevent
  unnecessary downloads.

- Emit a warning message when a file is not verified.
  Indicate that the file may be corrupt or that no
  checksum was specified.
2010-05-27 12:21:56 -04:00
David Cole f5e8ce522e Use RENAME, not COPY, to extract .tar.gz files.
Use ABSOLUTE file name for the RENAME operation.
  (Thanks to Marcus for figuring out that it doesn't
   work on Linux without the ABSOLUTE bit.)
2010-05-26 17:42:56 -04:00
David Cole ea6260cb18 Fix issue #10258: re-configure if args change.
Fixes issue http://public.kitware.com/Bug/view.php?id=10258
Also, fix complaint that DOWNLOAD_COMMAND cannot contain arguments
consisting entirely of upper case letters. It validly does when,
for example, you construct a custom cvs command line and the module
name is all upper case, like VTK.
2010-05-26 15:38:41 -04:00
David Cole 672d9ba78c Add svn user name and password to ExternalProject.
Thanks to JCFR for the leg work.
2010-05-26 14:50:19 -04:00
Michael Wild 51cc86167b Improve documentation of GetPrerequisites.cmake
Put the function documentation into the header-comment, improve
formatting and list the user-relevant functions first.

Signed-off-by: Michael Wild <themiwi@users.sourceforge.net>
2010-05-23 14:38:21 +02:00
Michael Wild f811470a96 Improve documentation of BundleUtilities.cmake
Put the function documentation into the header-comment, improve
formatting and list the user-relevant functions first.

Signed-off-by: Michael Wild <themiwi@users.sourceforge.net>
2010-05-23 14:38:20 +02:00
Brad King 571dc74891 Recognize Clang C and C++ compilers (see #10693)
Map to the platform and compiler information for GNU because the
compilers are command-line compatible for common operations.  Later we
can add Clang-specific features as necessary.  We honor the preferred
capitalization is "Clang", not the common mis-spelling "CLang".
2010-05-17 14:11:20 -04:00
Kovarththanan Rajaratnam 44e6467015 FindZLIB: make sure zlib.h exists before reading it 2010-05-13 06:34:33 +02:00
James Bigler 0d30e3fe91 Fixed: CUDA_VERSION_MAJOR/MINOR now computed after first run.
CUDA_VERSION_MAJOR and CUDA_VERSION_MINOR were only computed when CUDA_VERSION was first
computed.  Subsequent runs of FindCUDA would not have CUDA_VERSION_MAJOR/MINOR set.  We
now extract the major and minor versions from the CUDA_VERSION cache variable every run.
2010-05-12 16:38:51 -06:00
Alex Neundorf bca561ee46 -make CMAKE_ASM_FLAGS_INIT and friends work (#10577)
Alex
2010-05-12 22:04:31 +02:00
Alex Neundorf 08b56ae3be -make CMAKE_ASM_FLAGS_INIT and friends work (#10577)
Alex
2010-05-12 22:04:31 +02:00
Mathieu Malaterre a9a2af19d4 BUG: 0009840 Fix case when only Java is available by implementing COMP Runtime 2010-05-11 21:43:32 +02:00
Mathieu Malaterre 0d88e19fef BUG: 0009840 Fix case when only Java is available by implementing COMP Runtime 2010-05-11 21:43:32 +02:00
Bill Hoffman ef6b505caa Add GITCommand key value pair. 2010-05-11 09:29:55 -04:00
Bill Hoffman 83b00e00e2 Add GITCommand key value pair. 2010-05-11 09:29:55 -04:00
Alex Neundorf 50506090c8 -use the HINTS keyword for finding FindKDE4Internal.cmake
Alex
2010-05-11 00:32:27 +02:00
Alex Neundorf a8fd6e7180 -use the HINTS keyword for finding FindKDE4Internal.cmake
Alex
2010-05-11 00:32:27 +02:00
Miguel A. Figueroa-Villanueva 601ee1f735 BUG #10209: Fixed FindwxWidget CXX flags parsing error.
Was not removing definition flags (-D...) from cxx flags,
when the definition flag was last in the list returned from
wx-config.

--HG--
extra : rebase_source : 3452c52b92717f181e902abef38c1e2718ce3b27
2010-05-09 13:27:58 -04:00
Miguel A. Figueroa-Villanueva f90bdaf38e BUG #10209: Fixed FindwxWidget CXX flags parsing error.
Was not removing definition flags (-D...) from cxx flags,
when the definition flag was last in the list returned from
wx-config.

--HG--
extra : rebase_source : 3452c52b92717f181e902abef38c1e2718ce3b27
2010-05-09 13:27:58 -04:00
Alex Neundorf cdc484e4a6 -use find_package_handle_standard_args() in FindOpenAL (#9496)
Alex
2010-05-09 11:07:33 +02:00
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
Clinton Stimpson 108090fde9 Include relative path in generated qrc and uic files. Fixes #10413. 2010-03-17 16:33:03 -06:00
Clinton Stimpson 61ad5242b7 Change to use FindX11.cmake. Should fix #9929. 2010-03-17 10:48:05 -06:00
Clinton Stimpson 44492fff53 Add support for libXi. 2010-03-17 10:48:05 -06:00
Michael Wild beda5eab39 ENH: Hook in GetPrerequisites to override item type
The hook is called gp_resolved_file_type_override.

Signed-off-by: Michael Wild <themiwi@users.sourceforge.net>
2010-03-17 11:32:14 -04:00
Clinton Stimpson bd0b37ea3d ENH: Clarify a doc string. Fixes #10358. 2010-03-17 07:43:22 -06:00
Clinton Stimpson 5e1a2408fe ENH: Modify how OpenGL is searched for, that is, use FindOpenGL.cmake. 2010-03-16 22:40:44 -06:00
Brad King fd38eda9fe Support multiple arguments in CC,CXX,FC values
Teach compiler identification to support values such as

  export CC='gcc -g -O2'

by separating the arguments on spaces.  We already do this for the
values of CFLAGS, CXXFLAGS, and FFLAGS.
2010-03-15 15:17:18 -04:00
David Partyka 01f022c49c Add a new registry key to check for the location of MPICH2. 2010-03-11 10:42:07 -05:00
Brad King 00477de1c9 Use response file for objects on MinGW and MSYS
Windows command lines are limited to about 32K so we need to use
response files for linking very large lists of object files.

See issue #10401.
2010-03-11 09:46:18 -05:00
Miguel A. Figueroa-Villanueva 8f9f6b3ac1 BUG #9419: Added wxWidgets_EXCLUDE_COMMON_LIBRARIES option.
This allows the user not to link to the common libraries,
which are regularly required. The user must specify all
libraries that he does want to link in the find_package
line (png tiff jpeg zlib regex expat).

--HG--
extra : rebase_source : df29f96c957600629a34a1c5fafb8b3d6f274e22
2010-03-07 05:50:49 -04:00
Bill Hoffman b461a68786 Fix Qt with OpenGL on the Mac. 2010-03-10 13:51:17 -05:00
Bill Hoffman a9ac761938 Add .git .bzr and .hg to the list of default CPack ignore directories. 2010-03-08 10:46:27 -05:00
Zach Mullen 348f6c4d8c If tests failed on the last run, have them run first next time 2010-03-01 11:59:00 -05:00
Zach Mullen 09e748c69a Configurable path to CTest cost data file
Allow the user to set the CMake variable CTEST_COST_DATA_FILE, which will be used to store the cost data from test runs.  If not set, defaults to the original location in the build tree Testing/Temporary dir.
2010-03-01 11:06:28 -05:00
Brad King 4eba05de42 Suppress GNU flag -fPIC on Windows
Commit "Modernize GNU compiler info on Windows" (2009-12-02) reorganized
GNU flags on Windows but let -fPIC slip through for compilation of
objects in shared libraries.  While this flag is valid on most GNU
compiler platforms we need to suppress it in Windows-GNU.cmake just as
we already do in CYGWIN-GNU.cmake.
2010-02-19 08:23:31 -05:00
Clinton Stimpson 70290e1f64 Add support for QtDeclartive module. 2010-02-17 19:12:18 -05:00
Marcus Hanwell 1e43973741 A few small changed from Pat Marion (in VTK CVS too) 2010-02-17 14:36:17 -05:00
Marcus Hanwell f7a3db6403 Applied patch from Pat Marion - modules header macro.
This modifies the behavior of PYTHON_WRITE_MODULES_HEADER, should be backwards
compatible. Also marked a couple of the variables generated by adding Python
modules as advanced.
2010-02-17 11:37:37 -05:00
Marcus Hanwell 8d87d12ce6 Do not force frameworks on Mac OS X - never worked well. 2010-02-17 11:35:17 -05:00
Brad King 4685872078 FortranCInterface: Fix PathScale detection again
PathScale Fortran mangles module symbols as "MY_SUB.in.MY_MODULE" and
also requires "my_module_" when the module is imported.  We cannot
provide the symbol with ".in." mangling so we should not provide
"my_module_" because it would duplicate the one in the Fortran-provided
object file.

Commit "FortranCInterface: Fix PathScale detection" (2010-01-22) already
made the same fix for the non-underscore module case.
2010-02-16 13:24:44 -05:00
David Cole f48660fa85 Make a common function that prints the status during the checks for working compilers. Call it from all of the CMakeTesten_US.UTF-8Compiler.cmake files. In the message, print the full path to the tested compiler only for the Makefile generators. For Xcode and Visual Studio generators, print the generator instead so that users are not misled with the full path to a compiler that the generator may not even use. Xcode and Visual Studio have their own mechanisms for choosing the compiler to use during try_compile and build... 2010-02-12 14:32:20 -05:00
Brad King c4205773a5 Do not warn for unknown CTest UPDATE_TYPE
In the CTest module we previously warned if the source directory did not
contain known version control directories.  The message was:

  "CTest cannot determine repository type. Please set UPDATE_TYPE
   to 'cvs' or 'svn'. CTest update will not work."

This was confusing when building sources from a tarball.  Furthermore,
we now support many more version control tools.  This feature is now
mature enough that the warning causes confusion more than it provides
real help.  We simply remove it.
2010-02-10 10:43:33 -05:00
Brad King e18f3623e3 Detect Git repositories for CTest UPDATE_TYPE
The CTest module configures the command-line CTest dashboard mode.
We teach it to recognize .git directories.
2010-02-10 10:43:28 -05:00
Brad King ff101a565e Simplify CTest.cmake module with ELSEIF
We use ELSEIF to simplify the cascading IF blocks for detecting version
control tools.
2010-02-10 10:43:23 -05:00
Bill Hoffman 0619813e03 Fix for bug #10257, NSIS could remove a PATH if it was too long 2010-02-09 13:57:46 -05:00
Zach Mullen 41fcf6e155 Moved call to cache CDash version information to cmCTest::initialize. Also added a 3 second timeout when requesting the version from the server. Added an option to the CTestConfiguration that will be used to determine whether to query the version information at all. (Behavior for this setting is not yet defined.) Updated CMake's local CDash version setting to 1.6. 2010-02-08 09:47:39 -05:00
Brad King 11dcef910a Recognize the Compaq Fortran compiler
The compiler documents symbols _DF_VERSION_ and _VF_VERSION_ but they do
not seem to be available to the preprocessor.  Instead we add a vendor
query table entry for Compaq.  Running "f90 -what" produces

  Compaq Visual Fortran Optimizing Compiler Version ...

This clearly identifies the compiler.
2010-02-02 07:21:36 -05:00
Brad King 3c2ecbe74e Add alternate per-vendor compiler id detection
At least one Fortran compiler does not provide a preprocessor symbol to
identify itself.  Instead we try running unknown compilers with version
query flags known for each vendor and look for known output.  Future
commits will add vendor-specific flags/output table entries.
2010-02-01 09:03:05 -05:00
David Cole 6ee87b2e5c Fix issue #10155 - default value of CMAKE_OSX_DEPLOYMENT_TARGET should always be the empty string. When the value of CMAKE_OSX_DEPLOYMENT_TARGET is the empty string, the -mmacosx-version-min flag should not show up on the compiler command line. The logic for selecting default value of CMAKE_OSX_SYSROOT is orthogonal to and independent of the value of the deployment target. The default value for CMAKE_OSX_SYSROOT is the SDK that corresponds to the current version of Mac OSX on which cmake is running. 2010-01-29 11:56:35 -05:00
James Bigler aa495ad021 Add -rpath for cuda libraries on Apple. They use @rpath in the library link names. 2010-01-28 13:50:38 -05:00
James Bigler f04f912694 Updated the documentation on what kinds of flags you can use when setting target properties. 2010-01-28 13:08:56 -05:00
James Bigler d2d3672f1c Define __CUDACC__ during dependency scanning, since NVCC doesn't. 2010-01-28 12:58:22 -05:00
Alexander Neundorf eb4fe91e17 -remove unnecessary debug output
Alex
2010-01-27 16:46:00 -05:00
Brad King 21faaa5d7f FortranCInterface: Fix PathScale detection
PathScale Fortran mangles module symbols as "MYSUB.in.MYMODULE" and also
requires "mymodule_" when the module is imported.  We cannot provide the
symbol with ".in." mangling so we should not provide "mymodule_" because
it would duplicate the one in the Fortran-provided object file.
2010-01-22 14:15:47 -05:00
Alexander Neundorf 3551869e92 -also put CMAKE_LINKER in the C and CXX compiler information files
This is already done for assembler and is necessary for e.g. Symbian.

Alex
2010-01-22 12:41:55 -05:00
Brad King 3684f62340 Do not export all symbols from DLLs on Cygwin
In commit "use export all symbols on cygwin" (2003-01-21) we started
passing -Wl,--export-all-symbols when linking shared libraries.  Now
cygwin exports all symbols automatically if no symbols are explicitly
exported.  When symbols are explicitly exported we want to honor that
narrow interface.  Therefore this flag should not be passed.

Change based on patch from issue #10122.
2010-01-21 15:03:32 -05:00
Brad King 41024b006b Fix CMAKE_DL_LIBS on Cygwin
The variable should contain the name of a library needed to link the
symbol equivalent to dlopen.  On Cygwin no special library is needed,
and certainly not "gdi32".

Change based on patch from issue #10122.
2010-01-21 15:03:17 -05:00
Brad King 1804c6bfe2 Add PathScale shared library flags on Linux
We add platform-specific compiler information files

  Platform/Linux-PathScale-<lang>.cmake

to enable -fPIC and -shared flags for shared libraries.
2010-01-21 09:09:27 -05:00
Alexander Neundorf 03769801ff -make the imported targets feature of FindQt4.cmake fully backwards compatible
After discussing with Brad and Clinton:
-the namespace for the imported targets is now "Qt4::", tested with Makefiles, Visual Studio and XCode projects
-the imported targets are always created
-if QT_USE_IMPORTED_TARGETS is set to TRUE (it defaults to FALSE), the QT_QTFOO_LIBRARY variables are set to point to these imported
targets, otherwise the old behaviour is used.
-on OSX if Qt has been found as framework, disable QT_USE_IMPORTED_TARGETS, since cmake doesn't handle the framework directory as location of the library correctly

Alex
2010-01-18 16:23:21 -05:00
Clinton Stimpson 835b07a3a8 Put quotes arounds strings when doing STREQUAL. 2010-01-18 15:49:46 -05:00
Alexander Neundorf 1833961ce5 some tweaks as suggested by Brad (no functional changes)
-set the type of the IMPORTED libraries to UNKNOWN, this way also on Windows
only the "LOCATION" property has to be set
-the if() around the SET(QT_${basename}_FOUND 1) was useless (always true)
-the mapping of the configuration types DEBUG and PROFILE did not belong here

Alex
2010-01-18 13:38:38 -05:00
Alexander Neundorf 6d39313001 -create imported library targets for the Qt4 libs
This commit syncs FindQt4.cmake again with KDEs version.
Now for every Qt library an imported target with the name
Qt4ImportedTarget__<LIBNAME> is created.
This way we can now finally handle the release and debug versions of the Qt
libraries correctly.
Also, if a Qt-using project A installs a file with exported targets, these
targets now depend on the imported Qt targets, e.g.
Qt4ImportedTarget__QtCore. The location of QtCore is then resolved at
buildtime of project B, which uses the exported targets from project A.
 Before this patch the full path to the QtCore on the original build machine
of project A was stored, so this had to match the directory layout on the
build machine for project B.

Alex
2010-01-17 11:37:53 -05:00
Clinton Stimpson 55a3967eda Fix bug #10114. Find phonon on some installations. 2010-01-13 17:34:31 -05:00
Brad King e46e8fb937 Do not find cyg*.dll on Cygwin
While Cygwin supports linking directly to .dll files, the behavior is
now discouraged.  All Cygwin packages now provide import libraries of
the form lib*.dll.a and CMake has built the import libraries for years.

We believe it is now safe to stop explicitly searching for .dll files
because their import libraries will always be available when the
corresponding header files are available.  Users can always set
find_library cache entries to point at a .dll file by hand if they
really must use one.

Change based on patch from issue #10122.
2010-01-13 14:12:29 -05:00
Brad King 3cba2b3a0f Fix KDE3 .la file format on Cygwin
We teach KDE3Macros.cmake to generate .la files on Cygwin that match
those produced by libtool.  See issue #10122.
2010-01-13 13:54:34 -05:00
Brad King 12dcf9e4fb Search prefix /usr before root prefix /
Commit "Find locally installed software first" made /usr/local the first
prefix searched to be consistent with the Filesystem Hierarchy Standard:

  http://www.pathname.com/fhs/

The standard also implies that the root prefix "/" should not have any
package or development files.  The "/bin" and "/lib" directories should
have only minimal contents to boot the system.  No "/include" ever
exists.  This commit re-orders the search path prefix list from

  /usr/local
  /
  /usr

to

  /usr/local
  /usr
  /

to prefer package and development files over low-level system files.
See issue #10136.

On Cygwin /usr/lib == /lib and /usr/bin == /bin.  This change also makes
search results report locations as "/usr/..." instead of "/lib/...".
See issue #10122.
2010-01-13 13:36:03 -05:00
Brad King fdbe16c1f4 Use if(CYGWIN) instead of if(WIN32 AND UNIX)
CMake has defined CYGWIN on Cygwin for years, so we no longer need the
legacy form of the test.  Change based on patch from issue #10122.
2010-01-13 12:57:38 -05:00
Brad King da36cde059 PathScale C/C++/Fortran Compiler Information
We add compiler information files

  Compiler/PathScale-<lang>.cmake

to specify PathScale compiler information for C, C++, and Fortran
languages.  We use a macro in Compiler/PathScale.cmake to consolidate
the information common to all languages.
2010-01-13 12:14:31 -05:00
Brad King 1e9f58e605 Recognize the PathScale C/C++/Fortran compilers 2010-01-13 12:12:39 -05:00
Brad King 9ef3f8e820 Restore -rdynamic in Linux build rules
The commit "Drop -rdynamic from Linux build rules" removed default use
of the flag on Linux.  It was expected to be compatible because any
project using plugins should set ENABLE_EXPORTS on its executables to
export their symbols for use by the plugins in a cross-platform way.
However, it is possible to build without ENABLE_EXPORTS and load plugins
that do not link to any symbols from the executable explicitly.  These
plugins may need to see RTTI and other executable symbols needed by the
language implementation.  Executables using such plugins were broken by
the change.

If we want to remove the -rdynamic flag in the future we should do so in
a compatible way.  At that time we should also remove equivalent flags
on other platforms (like -bexpall on AIX).  We will either need a policy
or an explicit API to disable symbol exports on executables.

The primary purpose of the above-mentioned commit was to avoid passing
the -rdynamic flag to compilers on Linux that do not support it.  In
this commit we restore the flag but only on GNU and Intel compilers
which are known to support it.

See issue #9985.
2010-01-13 08:13:46 -05:00
Brad King 7b106a6fb3 Create Linux GNU compiler flag consolidation macro
This macro will be used for GNU compiler flags that are specific to
Linux but not to any language.
2010-01-13 08:13:19 -05:00
Brad King 6c1e24276f Detect Fortran ABI Information
Implement Fortran 32/64-bit ABI detection on some platforms.  We need to
set CMAKE_SIZEOF_VOID_P correctly in Fortran-only projects so that the
find_library() command knows whether to look for 64-bit binaries.  We
also detect ELF binaries to enable RPATH replacement.  See issue #10119.
2010-01-12 09:38:13 -05:00
James Bigler 6faa4ae15e Changed warning string to use the WARNING flag. 2010-01-08 12:57:43 -05:00
James Bigler 2316e04d13 Reordered the arguments, so that user generated arguments go last and thus get precedence. 2010-01-08 12:14:21 -05:00
James Bigler d3034f9b56 Disable the --host-compilation flag for CUDA >= 3.0 since it is derecated. 2010-01-08 12:12:54 -05:00
Philip Lowman 081b5dfd2e Fix Issue #9792, remove superfluous output when not searching for COMPONENTS, add 1.41 to the search 2010-01-05 00:55:14 -05:00
Philip Lowman eb66705db4 Fix issue #10065, "FindGTest.cmake doesn't handle spaces around arguments to TEST/TEST_F macro".
Also improved the documentation.
2010-01-05 00:14:58 -05:00
Philip Lowman aefd10ad70 Fixes issue #9862 by adding official msvc import library names to FindCURL 2010-01-04 23:25:57 -05:00
Philip Lowman 820e255312 Should get FindGTK2 working with fink on Mac OSX 2010-01-04 23:07:39 -05:00
Alexander Neundorf 241dd18004 make FindRuby work on Windows e.g. with ruby 1.9.1 (version string was constructed wrong)
Alex
2010-01-03 14:21:17 -05:00
David Cole 8d88de4b4a Fix issue with SDK not matching initial deployment target chosen by setting the MACOSX_DEPLOYMENT_TARGET environment variable. The problem was that we were setting the initial SDK value based on our own internal default value for deplyment target rather than the user's environment variable choice. The solution is to base the default value for the SDK on the deployment target variable after initially caching the deployment target... Every time I'm in this code I think I leave it cleaner, only to be proven otherwise. Let's give this one a whirl. Bleh. 2009-12-23 12:08:25 -05:00
Alexander Neundorf ffbae660cd fix logic of _QT4_ADJUST_LIB_VARS() wrt. release- and debug libraries
Now the case that both the release- and the debug-version of a library is
handled first, because otherwise we always ran into this branch, since the
debug-only and the release-only branch also set both variables.

Alex
2009-12-23 09:58:34 -05:00
Alexander Neundorf c424267cc1 -handle the REQUIRED and QUIET keywords in FindJNI.cmake, also set JNI_FOUND
Alex
2009-12-21 15:56:05 -05:00
Zach Mullen 7af553188e Added support for CTest awareness of the CDash version. This will help forward compatibility for both tools. Note that this changeset effectively makes the default to disable output compression. Now, to enable output compression, the CDASH_CTEST_VERSION must be explicity set to >= 1.6. Automated detection of the CDash version is the next step. 2009-12-21 12:27:04 -05:00
Alexander Neundorf a2c62d402c sync with KDE: sort the libs alphabetically
Alex
2009-12-20 10:34:13 -05:00
Alexander Neundorf 4740bf6b3e -add support for QtMultimedia and some sync with KDE
-the QtMultimedia module is new since Qt 4.6.0
-sort the doc entries alphabetically

Alex
2009-12-20 09:06:42 -05:00
Brad King 4ce7ffbfc5 FindHDF5: Fix Windows compile-line parsing
We modify the signature of _HDF5_parse_compile_line to pass the command
line variable name rather than the command line itself.  Otherwise the
CMake language MACRO implementation tries to parse the command line as
CMake syntax, which does not like backslashes.
2009-12-18 10:13:01 -05:00
Brad King c9b726c314 New CheckTypeSize for OS X Universal Binaries
We re-implement this module to support architecture-dependent type
sizes.  In the mixed-size case we generate C preprocessor code to select
the detected type size for each architecture.
2009-12-17 15:14:47 -05:00
Bill Hoffman 23c28adbf9 Fix for bug 9960, add support for MSVC10 runtime dlls. 2009-12-17 14:57:49 -05:00
Alexander Neundorf eb83c19789 -better support for Qt4 as frameworks
before this patch -F<framework> dir had to be added manually in some way
when using Qt4 installed as framework and when using FindQt4.cmake directly,
i.e. without UseQt4.cmake. With this patch the framework dir is
automatically added to QT_INCLUDE_DIR when Qt is installed as a framework.

Ok by Clinton, tested already in KDE by Mike Arthur.

Alex
2009-12-16 17:16:59 -05:00
David Cole d9f78eca72 Fix issue #10055 - add documentation for the CPack Mac OSX only Bundle generator.
Thanks to Tim Shead for the patch.
2009-12-15 17:36:56 -05:00
Clinton Stimpson 56ee3b43a9 BUG: Fix #10021 don't specify libraries Qt depends on unless Qt is static. 2009-12-15 16:16:45 -05:00
Brad King 0306080e6e FortranCInterface: Support '=' in language flags
The commit "FortranCInterface: Honor language flags in checks" taught
the FortranCInterface module to pass C and Fortran flags into its
detection and verification checks.  We improve on the change to allow
the '=' character in the language flags.  This requires passing the
cache entry type with the -D options.
2009-12-15 14:02:52 -05:00
David Cole 8a87458954 Fix issue #9782 - add documentation for variables used by CPack DragNDrop generators.
Thanks to Michael Wild for the patch.
2009-12-15 13:35:26 -05:00
Will Dicharry 7bc90c3edf Set value of HDF5_INCLUDE_DIR for backwards compatibility.
CMake 2.8 was released with the FindHDF5 module setting HDF5_INCLUDE_DIR rather
than the correct plural HDF5_INCLUDE_DIRS. Since this went into a release, it is
now necessary to set the singular for backwards compatibility.
2009-12-15 13:26:44 -05:00
David Cole ece03cadc4 Fix issue #9011 - eliminate unnecessary uses of CPACK_PACKAGE_INSTALL_DIRECTORY.
Replace them with CPACK_PACKAGE_NAME. The registry keys involved in this commit are used by Windows to track things in the Add/Remove programs portion of the Control Panel. With '\' characters in the keyname, the calls do not do what they are intended to do and the installed program never shows up in the control panel view. (Details noted in the issue itself.) Thanks to 'killerfox' for the patch.
2009-12-15 13:12:05 -05:00
David Cole a830786c44 Fix issues #9959 and #9898 - do not set CMAKE_OSX_DEPLOYMENT_TARGET if CMAKE_OSX_SYSROOT is set.
Default to "" for CMAKE_OSX_DEPLOYMENT_TARGET if CMAKE_OSX_SYSROOT is set. Also, add new error message to detect the case where there is a deployment target, but no SDK has been set. Fix args to STRING REGEX call so that it works even if _sdk_path variable is empty inside sanity check function.
2009-12-15 11:10:15 -05:00
Marcus Hanwell e4ebb49717 Added a second call to find_library to find the static library.
When there is no shared object to link to a second call to find library is
necessary to find the static Python library. Fixes an issue raised on the CMake
mailing list, and it should be included in the next CMake patch release.
2009-12-14 14:15:31 -05:00
Brad King 126c93cdda Provide macro to force Fortran compiler
We add the macro CMAKE_FORCE_Fortran_COMPILER to the cross-compiling
helper module CMakeForceCompiler.cmake so that toolchain files can force
a Fortran compiler as well as C and C++ compilers.  See issue #10032.
2009-12-14 11:40:23 -05:00
David Cole 490009c016 Fix issue #9764 - add TIMEOUT arg to ExternalProject_Add so that callers have explicit control over the amount of time they are willing to wait for a download step. Default to no timeout, which means just run download for however long it takes. 2009-12-11 15:04:55 -05:00
David Cole e28941b6d7 Consider a windows directory named syswow* a 'system' directory for GetPrerequisites.cmake purposes. 2009-12-11 14:42:26 -05:00
Brad King 55275e017d New decision method to enable Fortran tests
CMake does not enable Fortran for its own build, but it needs to find a
Fortran compiler to know if it is possible to enable Fortran tests.
Previously we searched for a hard-coded list of Fortran compilers which
was duplicated from the CMakeDetermineFortranCompiler.cmake module.  We
now run CMake on a small test project that enables the Fortran language
and reports the compiler it found.  This represents a more realistic
check of whether the Fortran tests will be able to find a compiler.
2009-12-10 12:16:38 -05:00
Alexander Neundorf e5efd87b31 Fix parallel HDF5 detection (#9982)
Alex
2009-12-09 15:17:55 -05:00
Mathieu Malaterre f1d4f951d6 Minor typo in comments 2009-12-08 08:59:25 -05:00
Brad King 700da5f266 Document usage of the include(CTest) module
Previously this module gave only very brief documentation.  We extend
the module's documentation to describe CTestConfig.cmake, interaction
with dashboard scripts, and the CTEST_USE_LAUNCHERS option.
2009-12-04 13:44:19 -05:00
David Cole 0b38bb4c53 Fix issue #2336 - honor the -C arg to ctest. Honor it for all stages of running -D dashboards from the command line and running ctest_configure, ctest_build and ctest_test commands in -S scripts. Also, allow a script to change it by setting the CTEST_CONFIGURATION_TYPE variable: allows for multiple configuration build/test cycles within one script. Add a new signature for the cmake command build_command that accepts CONFIGURATION as one argument. The original build_command signature is still there, but now marked as deprecated in the documentation. Of course... also add CTestConfig tests to verify that -C is honored for -D dashboards and -S scripts. 2009-12-04 12:09:01 -05:00
Brad King af14f1f2c3 Remove GNU-specific flags from Linux.cmake
We remove the shared library compile/link flags "-fPIC" and "-shared"
because they are not provided by all compilers on Linux.  This allows us
to drop code from the Linux-XL-*.cmake files that erases the bad flags.
All other supported compilers already provide their correct flags for
Linux in their own platform information files.
2009-12-04 10:22:30 -05:00
Brad King c106cb2e2f Generalize support for Portland Group Compiler
We factor flags from Platform/Linux-PGI-Fortran.cmake into language
independent helper modules

  Compiler/PGI.cmake
  Platform/Linux-PGI.cmake

and invoke the macros from

  Compiler/PGI-<lang>.cmake
  Platform/Linux-PGI-<lang>.cmake

This enables general support for the PGI compilers.
2009-12-04 10:21:57 -05:00
Brad King 2d948e94bf Remove duplicate info from Linux SunPro info files
The CMAKE_DL_LIBS variable is set platform-wide by Linux.cmake so we do
not need to duplicate it in Linux-SunPro-<lang>.cmake files.
2009-12-04 09:20:59 -05:00
Brad King e208397976 Consolidate Linux Intel compiler information
We consolidate duplicate code from Platform/Linux-Intel-<lang>.cmake
files into a macro defined in Platform/Linux-Intel.cmake.
2009-12-04 09:20:24 -05:00
Brad King 77ded39645 Fix GNU C and Fortran flags on SunOS
The commit "Split GNU compiler information files" intended to move GNU
flags from the platform-wide Platform/SunOS.cmake module into

  Platform/SunOS-GNU-<lang>.cmake

using a helper module Platform/SunOS-GNU.cmake to consolidate flags.
However, it accidentally put Fortran flags in the C language module and
left out the Fortran module altogether.  This fixes those mistakes.
2009-12-04 08:51:46 -05:00
Brad King 3e37ca8ecc Move GNU flags from SunOS.cmake to SunOS-GNU.cmake
The GNU-specific link-type flags do not belong in the platform-wide
file.
2009-12-02 16:58:52 -05:00
Brad King 4d72006bd6 Reduce duplication in Platform/<os>.cmake files
Several platform-wide linker flag variables are defined in
Modules/Platform/<os>.cmake files for C and then copied by the
Modules/CMake<lang>Information.cmake file for each language.
We now use this approach for the variables

  CMAKE_EXE_EXPORTS_${lang}_FLAG
  CMAKE_SHARED_LIBRARY_SONAME_${lang}_FLAG
  CMAKE_SHARED_LIBRARY_CREATE_${lang}_FLAGS

to avoid duplication for multiple languages in each platform file.
2009-12-02 15:17:53 -05:00
Brad King 9daa4a6c3f Remove CMAKE_SHARED_MODULE_RUNTIME_${lang}_FLAG
This platform configuration variable is unused.  Modules are built using
the value of CMAKE_SHARED_LIBRARY_RUNTIME_${lang}_FLAG.
2009-12-02 15:17:32 -05:00
Brad King 58d6057a52 Fix OS X dylib and module GNU flags
The commit "Split GNU compiler information files" broke the settings of

  CMAKE_SHARED_LIBRARY_CREATE_${lang}_FLAGS
  CMAKE_SHARED_MODULE_CREATE_${lang}_FLAGS

and started using just "-shared" for them.  This worked when tested on newer
Mac machines, but older ones really need "-dynamiclib" and "-bundle" (which are
the documented flags anyway).
2009-12-02 15:09:03 -05:00
Brad King aff3147917 Modernize GNU compiler info on Windows
This moves GNU compiler info on Windows into new-style modules

  Platform/Windows-GNU-<lang>.cmake

using language-independent helper module

  Platform/Windows-GNU.cmake

to define macros consolidating the information.
2009-12-02 11:27:59 -05:00
Brad King e28c16b482 Split GNU compiler information files
This moves GNU compiler flags into new-style modules

  Compiler/GNU-<lang>.cmake
  Platform/<os>-GNU-<lang>.cmake

We use language-independent helper modules

  Compiler/GNU.cmake
  Platform/<os>-GNU.cmake

to define macros consolidating the information.
2009-12-02 09:52:00 -05:00
Brad King 27873a48d7 Use one arch for 1.4-compatible check_type_size
The CMakeBackwardCompatibilityC module provides some try-compile results
that were automatically provided by CMake 1.4.  When performing the
checks for OS X universal binaries we just pick one architecture to get
through the checks without error.  Since CMake 1.4 did not support any
universal binaries, projects that want them should not depend on this
compatibility module anyway.
2009-12-01 17:35:39 -05:00
James Bigler bbfcb198f8 Fix #9970: Use execute_process instead of deprecated exec_program. 2009-12-01 16:28:26 -05:00
Brad King 1f06c33f8e Drop -rdynamic from Linux build rules
This is a GNU-specific option that should not be specified for all
compilers on Linux.  It tells the GNU compiler to pass -export-dynamic
to the linker to export symbols from executables for use by plugins.
Since we provide the ENABLE_EXPORTS target property to do the same thing
in a cross-platform way, there is no need to pass -rdynamic always.

Since the option is not useful for GNU tools and breaks other tools on
Linux we simply remove it from CMAKE_SHARED_LIBRARY_LINK_<lang>_FLAGS.
This also allows us to stop setting the variable in other Linux compiler
files just to erase the bad flag.

See issue #9985.
2009-12-01 14:25:21 -05:00
James Bigler c9235c0159 Don't allow -G -M on CUDA versions less than 3.0. 2009-11-30 17:05:18 -05:00
Brad King 4f43c1f276 Singly-quote target names for Watcom linker
The Watcom tools do their own command-line parsing and do not accept
double-quotes.  Instead we single-quote the target output name when
invoking wlink and other Watcom tools.  This fixes support for spaces in
the target output directory path when it is not under the build tree.
2009-11-30 11:16:24 -05:00
Eric Noulard 5b0bbd6c33 CPackRPM:: Fix bug on Open SuSE 11.2 coming from initial fix of bug8972
Eric
2009-11-28 09:57:59 -05:00
Alexander Neundorf 1d9cb15513 also provide QT_DESIGNER_EXECUTABLE and QT_LINGUIST_EXECUTABLE
Alex
2009-11-23 17:53:50 -05:00
Eric Noulard 03a8e912cb CPackRPM: do not forget to include installed symlinks (bug 9927)
Eric
2009-11-22 12:52:47 -05:00
Alexander Neundorf a10198c54e don't use deprecated UsePkgConfig.cmake file in FindLibXslt.cmake, some cosmetics
-use find_package(PkgConfig) instead of include(UsePkgConfig)
-remove the "if already cached make silent" logic, this is already handled by find_package_handle_standard_args()
-remove the if(WIN32) around pkg-config, it shouldn't be necessary

Alex
2009-11-22 05:51:38 -05:00
Bill Hoffman ceac346af6 Fix the build for non-MS compilers. 2009-11-21 09:39:30 -05:00
Bill Hoffman 4430bccc70 Change the way 32/64 bit compiles are detected with MSVC and intel makefile builds. Use the platform ID preprocessor approach. 2009-11-19 21:58:42 -05:00
Brad King 1699836b06 FortranCInterface: Honor language flags in checks
We pass CMAKE_C_FLAGS, CMAKE_CXX_FLAGS, and CMAKE_Fortran_FLAGS through
try_compile() for the FortranCInterface Detect and Verify projects.
This honors user-specified compiler flags for each language, thus
supporting flags that affect the Fortran mangling.
2009-11-19 17:42:48 -05:00
Mathieu Malaterre 7c9e5ba37f Fix FindOpenSSL on mingw. This has been reported to be working by ctrlaltca libero.it on cmake mailing list. 2009-11-19 04:02:36 -05:00
Clinton Stimpson 5fab48aa1c Fix bug #9918, spaces included in QT_LIBRARIES when using QtOpenGL. 2009-11-18 17:35:20 -05:00
Alexander Neundorf 12daac5714 only add -DQT_DLL on Windows, ok by Clinton
Alex
2009-11-17 15:20:58 -05:00
Clinton Stimpson f756b73ac5 Don't search for QtMotif on all platforms - only on X11. 2009-11-17 14:44:33 -05:00
Brad King 184a3418e6 FortranCInterface: Use CMake 2.8.0 behavior
The FortranCInterface module should execute with CMake 2.8.0 behavior
even if policies are set differently by the including project.  In
particular, it makes use of empty list elements and therefore expects
NEW behavior of CMP0007.
2009-11-17 14:33:28 -05:00
Eric Noulard 147aa6bf80 CPackRPM: tolerate redhat specific clean BUILD ROOT pre-build macro (bug 9872)
Eric
2009-11-15 13:55:42 -05:00
Alexander Neundorf 04d3f576b1 Document X11_X11_LIB and X11_X11_INCLUDE_PATH
Alex
2009-11-15 13:26:59 -05:00
Alexander Neundorf 0f457937f4 Split some logic of FindQt4.cmake into separate files, which are included automatically.
Qt4Macros.cmake: all the "public" macros of FindQt4.cmake
Qt4ConfigDependentSettings.cmake: the code for detecting the
Qt-configuration dependent additional libraries, e.g. when linking statically.

There should be no functional changes in this patch.
The patch reduces the length of FindQt4.cmake from 1700 lines to around 1000
lines, which is still long enough, but this should make the file a easier to
handle (and it is similar to what we do in KDE with FindKDE4Internal.cmake
and KDE4Macros.cmake)

Ok by Clinton.

Alex
2009-11-15 13:02:19 -05:00
Will Dicharry eb7e4498c4 Fixed parallel HDF5 detection when HDF5_INCLUDE_DIRS has multiple items. 2009-11-13 13:25:05 -05:00
Will Dicharry 3b8cab3a46 Changed HDF5_INCLUDE_DIR to HDF5_INCLUDE_DIRS to conform to standards. 2009-11-13 13:09:38 -05:00
Dave Partyka 3154cde792 BUG: rename MPI_PACKAGE_DIR and MPI_PREFIX_PATH vars to be prefixed with _ to prevent conflicts with known variable names in other projects. 2009-11-13 10:57:01 -05:00
Dave Partyka 279e4ec33b BUG: fix MPI_BASE_DIR var to be called _MPI_BASE_DIR to prevent conflicts with known variable names in other projects. 2009-11-13 10:52:28 -05:00
Bill Hoffman 6e8aa6cb52 Fix regression with CPACK_NSIS_PACKAGE_NAME, if the project is setting the CPACK_NSIS_DISPLAY_NAME then use that as the default value and not the CPACK_PACKAGE_INSTALL_DIRECTORY, also make sure it escapes \ correctly. 2009-11-12 17:58:37 -05:00
Alexander Neundorf fb8d583054 also search for "qmake-mac", which is installed by macports (http://lists.kde.org/?l=kde-core-devel&m=125797773120427&w=2)
Alex
2009-11-12 12:55:19 -05:00
Eric Noulard 33358ff4ff CPackRPM:: add support for USER specified post/pre [un]install scripts (fix bug 8988)
Eric
2009-11-11 15:55:44 -05:00
Eric Noulard c0814f4155 CPackRPM:: support user supplied "Provides" in spec file (fix bug 9584)
Eric
2009-11-11 15:27:44 -05:00
Alexander Neundorf 35a209b0db Search for the header QtAssistant for QT_QTASSISTANT_INCLUDE_DIR instead of QtAssistantClient
This should not change the result (since both should be in the same
directory), but seems a bit more logical and is also in sync with what is done in the KDE version.

Alex
2009-11-10 13:57:21 -05:00
Eric Noulard 28f54d0b85 CPackRPM:: Support USER supplied spec files (bug 9679)
Eric
2009-11-09 16:17:22 -05:00
Eric Noulard 2362fdc850 Fix CPack bug #9654
Eric
2009-11-09 14:06:36 -05:00
Alexander Neundorf 4a2f809124 Sort documentation entries better and move mark_as_advanced() a bit back
Alex
2009-11-09 12:55:46 -05:00
Alexander Neundorf 054eed5819 -another tiny sync with KDE4, no functional changes
Alex
2009-11-08 13:21:09 -05:00
Alexander Neundorf e325b1a38a some syncing with FindQt4.cmake from KDE, no functional changes
-the mark_as_advanced() calls for the variables coming from qmake are now in
the corresponding section, and not in the section where the include dirs are
foudn

Alex
2009-11-08 13:01:46 -05:00
Bill Hoffman 2fc9c5fb14 Add jom find module 2009-11-06 14:15:36 -05:00
Brad King 56d4619984 Remove non-language implicit link dependencies
Some compilers use implicit link options of the form

  -lcrt*.o
  -lgcc*
  -lSystem      (on Mac)
  -lSystemStubs (on Mac)

that provide system-wide symbols not specific to any language.
These need not be listed explicitly for mixed-language linking.

We teach CMake to remove the above items from the implicit library list
of each language.  This change makes it possible to mix GNU compiler
versions in some cases.
2009-11-05 12:17:08 -05:00
Mathieu Malaterre fdc6638b1c Add more documentation to module 2009-11-04 09:49:58 -05:00
Mathieu Malaterre b0960683b2 Adding support for java 1.6.0-oem. Make sure to report failure when user ask for version but regex failed to parse version number 2009-11-04 05:17:46 -05:00
James Bigler b1817590c1 Fix -fPIC from being used on executable object files.
BUILD_SHARED_LIBS is now only recognized when calling CUDA_ADD_LIBRARY.  If you want the CMAKE_SHARED_LIBRARY_C/CXX_FLAGS to be used, pass SHARED as an argument.  This prevents -fPIC from being used on objects destined for executables by default.
2009-11-04 01:15:31 -05:00
Mathieu Malaterre b93b6dc677 Replace FATAL_ERROR with status. Remove output when QUIET is ON 2009-11-03 17:22:57 -05:00
Mathieu Malaterre 59ce04d4f8 STYLE: minor documentation + typo 2009-11-02 11:50:33 -05:00
Mathieu Malaterre ccb8accc1b BUG: hardcoded path, are not hints. Split the two lists. Thanks Brad 2009-11-02 11:37:16 -05:00
Mathieu Malaterre ff0ff68967 BUG: To be able to use ENV and at the same time allow /usr/loca/bin to override /usr/bin, apply patch suggested by Hendrik Sattler (thanks) 2009-11-02 09:23:11 -05:00
Mathieu Malaterre 2b071aeb07 ENH: Make those variables advanced. 2009-11-02 09:15:04 -05:00
Mathieu Malaterre 865e0a11b4 BUG: 0009817 cmake does not search in solaris subdirectory for JAVA_INCLUDE_PATH2. Thanks to Gaetan Lehmann for patch 2009-11-02 04:03:06 -05:00
Mathieu Malaterre 0615218bdf STYLE: respect convention (while being backward compat) 2009-10-30 12:17:25 -04:00
Mathieu Malaterre d25952ee9f FIX: BUG: 0009124. Fix documentation 2009-10-30 12:06:53 -04:00
Mathieu Malaterre 74805dbbbd ENH: FIX 0009777. This should sync FindJava and CMakeDetermineJavaCompiler.cmake now 2009-10-30 11:55:57 -04:00
Mathieu Malaterre 17ad96111b FIX: BUG: 0009804. Update FindDCMTK to look in more paths. Start looking for command line tool: dcmdump/dcmdjpeg/dcmdrle 2009-10-30 11:48:44 -04:00
Mathieu Malaterre 54541d4a47 FIX: BUG: 0008971 FindOpenSSL improvement. Teaches cmake to find openssl on win32. openssl comes with the crypto libs which are the important part of the openssl project. 2009-10-30 11:35:15 -04:00
Mathieu Malaterre ae27492091 STYLE: Fix documentation (thanks Brad). 2009-10-30 11:22:41 -04:00
Mathieu Malaterre 3d898c2534 FIX: BUG: 0002199 Adding documentation for swig_generated_file_fullname 2009-10-30 11:13:00 -04:00
Mathieu Malaterre c0ec66b6d7 FIX: BUG: 0007915 Integrate portion of the patch. Also add .pyd support for python module. 2009-10-30 11:07:10 -04:00
Mathieu Malaterre bb123d0b81 ENH: Update code: 1. In version 1.6.0_17, 17 is now the TWEAK version as per cmake convention. 2. Use VERSION_LESS to compare version, which simplify code 3. Enhance testing, see: https://gdcm.svn.sourceforge.net/svnroot/gdcm/Sandbox/CMakeBug/8/CMakeLists.txt 2009-10-30 10:49:12 -04:00
Mathieu Malaterre 5c594b6f3a FIX: BUG: 0009795 FindJava now respect naming convention and handle VERSION/EXACT. 2009-10-30 04:05:59 -04:00
Will Dicharry 518f9c57b7 Fixed bug in FindHDF5 caused by hdf5.h existing without H5pubconf.h. 2009-10-29 17:18:41 -04:00