summaryrefslogtreecommitdiffstats
path: root/Modules
Commit message (Collapse)AuthorAgeFilesLines
* some tweaks as suggested by Brad (no functional changes)Alexander Neundorf2010-01-181-16/+4
| | | | | | | | | -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
* -create imported library targets for the Qt4 libsAlexander Neundorf2010-01-171-34/+32
| | | | | | | | | | | | | | | | | 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
* Fix bug #10114. Find phonon on some installations.Clinton Stimpson2010-01-131-0/+10
|
* Do not find cyg*.dll on CygwinBrad King2010-01-131-2/+2
| | | | | | | | | | | | | | 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.
* Fix KDE3 .la file format on CygwinBrad King2010-01-131-1/+5
| | | | | We teach KDE3Macros.cmake to generate .la files on Cygwin that match those produced by libtool. See issue #10122.
* Search prefix /usr before root prefix /Brad King2010-01-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* Use if(CYGWIN) instead of if(WIN32 AND UNIX)Brad King2010-01-131-2/+2
| | | | | 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.
* PathScale C/C++/Fortran Compiler InformationBrad King2010-01-134-0/+43
| | | | | | | | | | 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.
* Recognize the PathScale C/C++/Fortran compilersBrad King2010-01-133-0/+8
|
* Restore -rdynamic in Linux build rulesBrad King2010-01-132-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | 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.
* Create Linux GNU compiler flag consolidation macroBrad King2010-01-134-0/+28
| | | | | This macro will be used for GNU compiler flags that are specific to Linux but not to any language.
* Detect Fortran ABI InformationBrad King2010-01-122-2/+44
| | | | | | | 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.
* Changed warning string to use the WARNING flag.James Bigler2010-01-081-1/+1
|
* Reordered the arguments, so that user generated arguments go last and thus ↵James Bigler2010-01-081-7/+7
| | | | get precedence.
* Disable the --host-compilation flag for CUDA >= 3.0 since it is derecated.James Bigler2010-01-081-1/+5
|
* Fix Issue #9792, remove superfluous output when not searching for ↵Philip Lowman2010-01-051-18/+34
| | | | COMPONENTS, add 1.41 to the search
* Fix issue #10065, "FindGTest.cmake doesn't handle spaces around arguments to ↵Philip Lowman2010-01-051-7/+10
| | | | | | TEST/TEST_F macro". Also improved the documentation.
* Fixes issue #9862 by adding official msvc import library names to FindCURLPhilip Lowman2010-01-051-4/+7
|
* Should get FindGTK2 working with fink on Mac OSXPhilip Lowman2010-01-051-1/+9
|
* make FindRuby work on Windows e.g. with ruby 1.9.1 (version string was ↵Alexander Neundorf2010-01-031-4/+5
| | | | | | constructed wrong) Alex
* Fix issue with SDK not matching initial deployment target chosen by setting ↵David Cole2009-12-231-31/+37
| | | | 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.
* fix logic of _QT4_ADJUST_LIB_VARS() wrt. release- and debug librariesAlexander Neundorf2009-12-231-13/+15
| | | | | | | | 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
* -handle the REQUIRED and QUIET keywords in FindJNI.cmake, also set JNI_FOUNDAlexander Neundorf2009-12-211-0/+5
| | | | Alex
* Added support for CTest awareness of the CDash version. This will help ↵Zach Mullen2009-12-211-0/+1
| | | | 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.
* sync with KDE: sort the libs alphabeticallyAlexander Neundorf2009-12-201-9/+8
| | | | Alex
* -add support for QtMultimedia and some sync with KDEAlexander Neundorf2009-12-201-6/+11
| | | | | | | -the QtMultimedia module is new since Qt 4.6.0 -sort the doc entries alphabetically Alex
* FindHDF5: Fix Windows compile-line parsingBrad King2009-12-181-6/+6
| | | | | | | 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.
* New CheckTypeSize for OS X Universal BinariesBrad King2009-12-174-137/+201
| | | | | | 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.
* Fix for bug 9960, add support for MSVC10 runtime dlls.Bill Hoffman2009-12-171-0/+69
|
* -better support for Qt4 as frameworksAlexander Neundorf2009-12-162-4/+10
| | | | | | | | | | | 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
* Fix issue #10055 - add documentation for the CPack Mac OSX only Bundle ↵David Cole2009-12-151-0/+21
| | | | | | generator. Thanks to Tim Shead for the patch.
* BUG: Fix #10021 don't specify libraries Qt depends on unless Qt is static.Clinton Stimpson2009-12-152-8/+29
|
* FortranCInterface: Support '=' in language flagsBrad King2009-12-152-5/+5
| | | | | | | | 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.
* Fix issue #9782 - add documentation for variables used by CPack DragNDrop ↵David Cole2009-12-151-0/+39
| | | | | | generators. Thanks to Michael Wild for the patch.
* Set value of HDF5_INCLUDE_DIR for backwards compatibility.Will Dicharry2009-12-151-0/+5
| | | | | | 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.
* Fix issue #9011 - eliminate unnecessary uses of CPACK_PACKAGE_INSTALL_DIRECTORY.David Cole2009-12-151-10/+10
| | | | 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.
* Fix issues #9959 and #9898 - do not set CMAKE_OSX_DEPLOYMENT_TARGET if ↵David Cole2009-12-151-14/+29
| | | | | | 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.
* Added a second call to find_library to find the static library.Marcus Hanwell2009-12-141-0/+8
| | | | | | 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.
* Provide macro to force Fortran compilerBrad King2009-12-141-0/+20
| | | | | | 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.
* Fix issue #9764 - add TIMEOUT arg to ExternalProject_Add so that callers ↵David Cole2009-12-111-5/+12
| | | | 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.
* Consider a windows directory named syswow* a 'system' directory for ↵David Cole2009-12-111-1/+1
| | | | GetPrerequisites.cmake purposes.
* New decision method to enable Fortran testsBrad King2009-12-101-3/+0
| | | | | | | | | | 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.
* Fix parallel HDF5 detection (#9982)Alexander Neundorf2009-12-091-1/+1
| | | | Alex
* Minor typo in commentsMathieu Malaterre2009-12-081-2/+2
|
* Document usage of the include(CTest) moduleBrad King2009-12-041-9/+45
| | | | | | 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.
* Fix issue #2336 - honor the -C arg to ctest. Honor it for all stages of ↵David Cole2009-12-042-6/+12
| | | | 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.
* Remove GNU-specific flags from Linux.cmakeBrad King2009-12-044-7/+0
| | | | | | | | 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.
* Generalize support for Portland Group CompilerBrad King2009-12-048-15/+86
| | | | | | | | | | | | | | | 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.
* Remove duplicate info from Linux SunPro info filesBrad King2009-12-043-6/+0
| | | | | 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.
* Consolidate Linux Intel compiler informationBrad King2009-12-044-28/+38
| | | | | We consolidate duplicate code from Platform/Linux-Intel-<lang>.cmake files into a macro defined in Platform/Linux-Intel.cmake.