summaryrefslogtreecommitdiffstats
path: root/Modules
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic '11279_vs10sp1_and_improvements'Brad King2011-06-201-25/+115
|\ | | | | | | | | effb6bb Detect VS 2010 SP1, faster and more robust detection
| * Detect VS 2010 SP1, faster and more robust detectionPhilip Lowman2011-06-151-25/+115
| | | | | | | | | | | | | | Patch from Aaron C. Meadows Adds support for detecting VS 2010 SP1 Also improves performance using CMAKE_CXX_COMPILER if it is available and for robustness falls back using try_compile() and try_run()
* | Merge topic 'doc-spelling-formatting-issue-12287'Brad King2011-06-201-7/+2
|\ \ | | | | | | | | | | | | d66459b Documentation: Fix spelling / formatting errors (#12287)
| * | Documentation: Fix spelling / formatting errors (#12287)Modestas Vainius2011-06-191-7/+2
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | The patch fixes the following problems spotted by lintian: W: cmake-data: manpage-has-errors-from-man usr/share/man/man1/cmakemodules.1.gz 2641: warning [p 39, 1.5i]: can't break line I: cmake-data: spelling-error-in-manpage usr/share/man/man1/cmakeprops.1.gz explict explicit I: cmake: spelling-error-in-binary usr/bin/cmake explict explicit I: cmake: spelling-error-in-binary usr/bin/cpack explict explicit I: cmake: spelling-error-in-binary usr/bin/ctest explict explicit W: cmake: manpage-has-errors-from-man usr/share/man/man1/cmake.1.gz 7300: warning [p 120, 3.3i]: can't break line I: cmake: spelling-error-in-manpage usr/share/man/man1/cmake.1.gz explict explicit I: cmake-curses-gui: spelling-error-in-binary usr/bin/ccmake explict explicit I: cmake-qt-gui: spelling-error-in-binary usr/bin/cmake-gui explict explicit
* | Merge topic 'FindBoost_bugfixes_060911'Brad King2011-06-201-1/+8
|\ \ | | | | | | | | | | | | | | | 974374a FindBoost: Also search for 1.46.1 f26d1cf FindBoost: Fixes #12188
| * | FindBoost: Also search for 1.46.1Philip Lowman2011-06-101-1/+2
| | |
| * | FindBoost: Fixes #12188Philip Lowman2011-06-101-0/+6
| | | | | | | | | | | | | | | | | | | | | Workaround an issue where users wanted to use Boost_LIBRARIES with the install() command and debug/optimized keywords were interfering. Now debug/optimized keywords are removed if the release & debug library are the same.
* | | Merge topic 'FindSWIG-find_program-NAMES-issue-12280'Brad King2011-06-201-1/+1
|\ \ \ | |_|/ |/| | | | | | | | 03809b1 FindSWIG: Use NAMES in find_program directives (#12280)
| * | FindSWIG: Use NAMES in find_program directives (#12280)Julien Malik2011-06-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | Without this, regular swig (not 2.0) executable is not found automatically. Commit 55b7c87e (Add support for new swig 2.0 application, 2011-03-28) added support for finding swig 2.0 at the (accidental) expense of not finding 1.x. Fix this regression.
* | | Merge topic 'library-multiarch-issue-12037'Brad King2011-06-147-0/+33
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 1ed19bc multiarch: Set CMAKE_LIBRARY_ARCHITECTURE_REGEX for Linux|Hurd|kFreeBSD 52a6ed2 Test find_package multiarch support (#12037) b41ad3b Teach find_(library|package) about Linux multiarch (#12037)
| * | | multiarch: Set CMAKE_LIBRARY_ARCHITECTURE_REGEX for Linux|Hurd|kFreeBSDModestas Vainius2011-06-133-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Fix linux CMAKE_LIBRARY_ARCHITECTURE_REGEX to support armel-linux-gnueabi. * Add CMAKE_LIBRARY_ARCHITECTURE_REGEX on kFreeBSD. * Add CMAKE_LIBRARY_ARCHITECTURE_REGEX on GNU (Hurd). Also regex is improved to support quadlets. Even if I have not seen this in the wild yet, reportedly they are possible.
| * | | Teach find_(library|package) about Linux multiarch (#12037)Brad King2011-06-085-0/+29
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Implement support for multiarch as specified here: http://wiki.debian.org/Multiarch https://wiki.ubuntu.com/MultiarchSpec Detect the <arch> part of <prefix>/lib/<arch> from the implicit library search path from each compiler to set CMAKE_<lang>_LIBRARY_ARCHITECTURE. Define CMAKE_LIBRARY_ARCHITECTURE using one of these values (they should all be the same). Teach the find_library and find_package commands to search <prefix>/lib/<arch> whenever they would search <prefix>/lib.
* | | Merge topic '10997_PROTOBDUF_GENERATE_CPP_returns_wrong_path'Brad King2011-06-141-2/+22
|\ \ \ | | | | | | | | | | | | | | | | 3982603 10997: PROTOBUF_GENERATE_CPP now supports proto files outside current dir
| * | | 10997: PROTOBUF_GENERATE_CPP now supports proto files outside current dirPhilip Lowman2011-06-141-2/+22
| | | |
* | | | Merge topic 'qt4-import-targets-mac'Brad King2011-06-141-23/+24
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | e7f05d9 Add imported targets support for frameworks on Mac.
| * | | | Add imported targets support for frameworks on Mac.Clinton Stimpson2011-06-131-23/+24
| | |/ / | |/| |
* | | | Merge topic 'qt4-useqt-module-deps'Brad King2011-06-141-0/+7
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 5f983d1 Qt4: complete module dependencies in UseQt4.cmake
| * | | | Qt4: complete module dependencies in UseQt4.cmakeClinton Stimpson2011-06-131-0/+7
| |/ / /
* | | | Merge topic 'gnu-isystem-flag-issue-12258'Brad King2011-06-141-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 33f5a83 GNU: Fix CMAKE_INCLUDE_SYSTEM_FLAG_<lang> value (#12258)
| * | | | GNU: Fix CMAKE_INCLUDE_SYSTEM_FLAG_<lang> value (#12258)Brad King2011-06-131-1/+1
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix typo introduced by commit e28c16b4 (Split GNU compiler information files, 2009-12-02). Reported-by: Campbell Barton <ideasman42@gmail.com> Suggested-by: Michael Hertling <mhertling@online.de>
* | | | Add some more Specs file tag handling.Eric NOULARD2011-06-121-1/+5
| | | |
* | | | CPackRPM: Enhance documentationEric NOULARD2011-06-121-2/+8
|/ / /
* | | Merge topic 'fix-12034-fixup-bundle-with-non-dotapp-exe'Brad King2011-06-072-29/+28
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 51e16c0 BundleUtilities: Avoid test on Watcom dashboards (#12034) 41f962a Revert "BundleUtilities: Run test on Windows if either MSVC or dumpbin was found." e17135e BundleUtilities: Add rpath to loadable modules in test. 8064044 BundleUtilities: Print reason for not loading module.so f3de459 BundleUtilities: Run test on Windows if either MSVC or dumpbin was found. 900bf98 BundleUtilities: Disable running test on Windows unless using MSVC. fa4dc08 BundleUtilities: Fix issues with custom target DEPENDS in test (#12034) e40b79e BundleUtilities: Fix test when using xcode (#12034) b68d3dc BundleUtilities: Fix regex to extract dependents from ldd (#12034) 7ac7b43 BundleUtilities: Work w/ non .app exes on Mac (#12034)
| * | | BundleUtilities: Fix regex to extract dependents from ldd (#12034)Clinton Stimpson2011-05-311-1/+1
| | | | | | | | | | | | | | | | This regex works with spaces in the path.
| * | | BundleUtilities: Work w/ non .app exes on Mac (#12034)Clinton Stimpson2011-05-272-28/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also add a test of BundleUtilities including an exe, some shared libs, a plugin, and a framework-style lib. This test presently runs (and this functionality works) on Linux, Mac and Windows. For now, the framework-style lib is built as a plain old shared lib because there is another yet-unresolved issue with local frameworks without rpaths on the Mac.
* | | | Merge topic 'fix-BundleUtilities-cryptic-error-message'Brad King2011-06-071-3/+15
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | 8f0667c BundleUtilities: Avoid a cryptic and unhelpful error message
| * | | BundleUtilities: Avoid a cryptic and unhelpful error messageDavid Cole2011-06-021-3/+15
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the path to "resolved_embedded_item" was shorter than the path to the bundle being fixed up, fixup_bundle would fail with a cmake error like: "string end index: 110 is out of range 0 - 85" Detect when the path of resolved_embedded_item is too short to be embedded in the bundle, and report the proper error message, so the poor developer reading it has a snowball's chance of actually fixing the issue.
* | | Merge topic 'XL-Fortran-moddir-issue-12246'Brad King2011-06-021-0/+2
|\ \ \ | | | | | | | | | | | | | | | | 3bb8566 XL: Place Fortran modules with -qmoddir= flag (#12246)
| * | | XL: Place Fortran modules with -qmoddir= flag (#12246)Brad King2011-06-011-0/+2
| |/ / | | | | | | | | | Suggested-by: Luis Kornblueh <luis.kornblueh@zmaw.de>
* | | Merge topic '12128_FindProtobuf_module_behavior_under_Windows_is_annoying'Brad King2011-06-021-22/+82
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 517837f Fix , to - in Copyright message so it passes CMake.ModuleNotices test 162f3fb Merge branch 'master' of git://public.kitware.com/cmake into 12128_FindProtobuf_module_behavior_under_Windows_is_annoying ca000a0 FindProtobuf: Better MSVC support, Searching for protobuf lite
| * | | Fix , to - in Copyright message so it passes CMake.ModuleNotices testPhilip Lowman2011-05-261-1/+1
| | | |
| * | | Merge branch 'master' of git://public.kitware.com/cmake into ↵Philip Lowman2011-05-269-9/+33
| |\ \ \ | | |/ / | | | | | | | | 12128_FindProtobuf_module_behavior_under_Windows_is_annoying
| * | | FindProtobuf: Better MSVC support, Searching for protobuf litePhilip Lowman2011-05-261-22/+82
| | | | | | | | | | | | | | | | | | | | | | | | Add support for finding debug libraries Add support for searching Google provided MSVC project dir structure for libs Add support for finding Protobuf "Lite" libraries
* | | | Merge topic 'hdf5-module-bug-fix'Brad King2011-06-021-45/+95
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e38216c Remove unnecessary mark_as_advanced from FindHDF5. 93ba19e FindHDF5 ensures good link lines when libraries are duplicated. 0584701 Fix for bug 11752, mixed debug and release libraries. 4e12284 Use HDF5_FOUND to control autoconf and CMake built FindHDF5. 2ba826e Use CMAKE_CURRENT_LIST_DIR to locate FindPackageHandleStandardArgs. 3978f32 Add logic for CMake built HDF5 install. 063ac87 HDF5 high level library is a find COMPONENT now. 34ea179 Modified the FindHDF5.cmake file to locate the Fortran bindings.
| * | | Remove unnecessary mark_as_advanced from FindHDF5.Will Dicharry2011-05-251-15/+6
| | | |
| * | | FindHDF5 ensures good link lines when libraries are duplicated.Will Dicharry2011-05-251-5/+16
| | | | | | | | | | | | | | | | | | | | Duplicates must be removed from the beginning of the link libraries to ensure unresolved symbols can be found.
| * | | Fix for bug 11752, mixed debug and release libraries.Will Dicharry2011-05-251-3/+7
| | | |
| * | | Use HDF5_FOUND to control autoconf and CMake built FindHDF5.Will Dicharry2011-05-251-35/+34
| | | |
| * | | Use CMAKE_CURRENT_LIST_DIR to locate FindPackageHandleStandardArgs.Will Dicharry2011-05-241-1/+1
| | | |
| * | | Add logic for CMake built HDF5 install.Will Dicharry2011-05-161-15/+37
| | | | | | | | | | | | | | | | | | | | The find module calls find_package( HDF5 QUIET NO_MODULE ). If that succeeds, the find module variables are set based on the imported target locations.
| * | | HDF5 high level library is a find COMPONENT now.Will Dicharry2011-05-161-2/+7
| | | | | | | | | | | | | | | | | | | | The HDF5 high level library was originally hard coded as a dependency when the C bindings are desired. The high level API is now requested as a COMPONENT.
| * | | Modified the FindHDF5.cmake file to locate the Fortran bindings.Tim Gallagher2011-05-161-7/+25
| | | |
* | | | Merge topic 'output-compile-lines'Brad King2011-05-241-0/+6
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cdc2b41 Fix CompileCommandOutput test build on Windows 7039d1f Fix CompileCommandOutput test for Make tools not supporting spaces 4268e3d run_compile_commands: Cast istream::get() result to char c45c60b run_compile_commands: Avoid extra stl vector conversion 7c5be51 run_compile_commands: Avoid shadow in std::map<>::at workaround 169bb05 Provide std::map<>::at for use in run_compile_commands 4e2185c Make std::map usage more portable in language=>flags/defines maps a7e7a04 Fix run_compile_commands build on Apple GCC 3.3 c9174c0 Fix signed/unsigned comparison in EscapeJSON 8346a28 Only offer the compile command output feature on unix systems 0e6b05f Adds a test for the compile command line output. 5674844 make compile command output optional fe07b05 implement cxx command output 65c0c24 cache flags and defines 3f064ef refactor flags and defines
| * | | | Only offer the compile command output feature on unix systemsManuel Klimek2011-05-161-3/+6
| | | | |
| * | | | make compile command output optionalManuel Klimek2011-04-251-0/+3
| | | | |
* | | | | Merge topic 'CPackRPM-fixForAIX'Brad King2011-05-241-3/+3
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | db45b10 CPack make RPM work on AIX. fix #0012183 merge patch from Pasi Valminen
| * | | | | CPack make RPM work on AIX. fix #0012183 merge patch from Pasi ValminenEric NOULARD2011-05-211-3/+3
| | |/ / / | |/| | |
* | | | | Merge topic 'absoft-fortran-compiler'Brad King2011-05-246-4/+19
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | 8bd3e51 Absoft: Enable FortranCInterface check in Fortran test d7b376b Absoft: Detect implicit link libraries on Linux and Mac ac5b999 Add Absoft Fortran compiler id and basic flags
| * | | | Absoft: Detect implicit link libraries on Linux and MacBrad King2011-05-203-3/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use the "-X -v" flag to the Absoft front-end to pass "-v" to the gcc it invokes under the hood. Teach CMakeParseImplicitLinkInfo to exclude linker version lines from consideration as link lines. Fix parsing of Sun's linker search path option "-Y..." to avoid conflict with the Mac linker option "-Y<num>".
| * | | | Add Absoft Fortran compiler id and basic flagsBrad King2011-05-203-1/+12
| | | | | | | | | | | | | | | | | | | | | | | | | Identification at preprocessing time depends on definition of __ABSOFT__ to be added in service pack V11.1.2 of the compiler.