summaryrefslogtreecommitdiffstats
path: root/Modules
Commit message (Collapse)AuthorAgeFilesLines
* Provide macro write_basic_config_version_file()Alex Neundorf2011-08-013-0/+121
| | | | | | | | | | | This macro can be used to generate basic version files which can be installed along a Config.cmake file to provide versioning support. This (3rd try) is implemented using a macro, which maps the COMPATIBILITY mode to a filename and configure_file()s the resulting file. Alex
* Merge topic 'search-for-aspell'Brad King2011-07-261-3/+8
|\ | | | | | | | | bb3a438 Search for the ASPELL executable
| * Search for the ASPELL executableArnaud Gelas2011-07-221-3/+8
| |
* | Merge topic 'qt4-apple-framework-fix'Brad King2011-07-261-13/+13
|\ \ | | | | | | | | | | | | 702538e Qt4: Fix reference of undefined variable when detecting frameworks on Mac OS X
| * | Qt4: Fix reference of undefined variable when detecting frameworks on Mac OS XClinton Stimpson2011-07-251-13/+13
| |/
* | Merge topic 'cross-qt4-find-includes'Brad King2011-07-261-1/+1
|\ \ | | | | | | | | | | | | 0ae8a34 Add qt4/QtCore to help find Qt headers when cross-compiling.
| * | Add qt4/QtCore to help find Qt headers when cross-compiling.Clinton Stimpson2011-07-221-1/+1
| |/
* | Merge topic 'CheckCXXSymbolExists'Brad King2011-07-262-9/+58
|\ \ | | | | | | | | | | | | 757a6a0 Add CheckCXXSymbolExists.cmake, so this can be used also for C++
| * | Add CheckCXXSymbolExists.cmake, so this can be used also for C++Alex Neundorf2011-07-082-9/+58
| |/ | | | | | | | | | | | | This commit splits check_symbol_exists() so that the actual implementation can be also used by check_cxx_symbol_exists() Alex
* | Merge topic 'PushCheckState'Brad King2011-07-261-0/+61
|\ \ | | | | | | | | | | | | | | | d64ba0b Fix copyright notice test 1325260 Add macros cmake_push/pop_check_state() as discussed on the list.
| * | Fix copyright notice testAlex Neundorf2011-07-071-3/+12
| | | | | | | | | | | | Alex
| * | Add macros cmake_push/pop_check_state() as discussed on the list.Alex Neundorf2011-07-071-0/+52
| |/ | | | | | | | | | | | | | | This patch adds two macros cmake_push_check_state() and cmake_pop_check_state(), which can be used to save and restore the contents of the CMAKE_REQUIRED_xxx variables. Alex
* | Merge topic 'qt4-no-build-type'Brad King2011-07-261-0/+3
|\ \ | | | | | | | | | | | | 5a2b208 Add -DQT_NO_DEBUG if no build type is specified so Qt plugins will work.
| * | Add -DQT_NO_DEBUG if no build type is specified so Qt plugins will work.Clinton Stimpson2011-06-231-0/+3
| | |
* | | Merge topic 'FindSubversion-non-interactive-issue-12304'Brad King2011-07-261-1/+1
|\ \ \ | | | | | | | | | | | | | | | | 0c6e852 FindSubversion: Invoke svn non-interactively (#12304)
| * | | FindSubversion: Invoke svn non-interactively (#12304)Aaron C. Meadows2011-06-241-1/+1
| |/ / | | | | | | | | | Otherwise Subversion_WC_LOG hangs if credentials are not set.
* | | Merge topic 'FindMPI-try-regular-compiler'Brad King2011-07-261-4/+62
|\ \ \ | | | | | | | | | | | | | | | | | | | | 8756e77 Fix issues with removing try_compile input file. e00d2c4 Try regular compiler when no MPI compiler.
| * | | Fix issues with removing try_compile input file.Todd Gamblin2011-06-211-8/+12
| | | | | | | | | | | | | | | | | | | | | | | | - Don't remove input file - Put output in ${CMAKE_CURRENT_BINARY_DIR}${CMAKE_FILES_DIRECTORY} - Remove try_compile variable from the cache after using
| * | | Try regular compiler when no MPI compiler.Todd Gamblin2011-06-211-4/+58
| |/ / | | | | | | | | | | | | | | | | | | | | | If FindMPI can't interrogate any of the available compilers, it attempts to compile simple MPI programs with CMAKE_${lang}_COMPILER. If this works, it uses that as MPI_${lang}_COMPILER. This allows MPI to be discovered on Cray XT/XE systems, where modules are used and cc, CC, and ftn compilers *are* MPI compilers.
* | | Merge topic 'vs-ia64'Brad King2011-07-262-3/+3
|\ \ \ | | | | | | | | | | | | | | | | | | | | aed92cc Add VisualStudio 9 and 10 generators for Itanium platform d44c68f VS: Factor Find64BitTools out of Win64 generator to parent
| * | | Add VisualStudio 9 and 10 generators for Itanium platformMatej Hribernik2011-06-202-3/+3
| | | |
* | | | Merge topic 'asn_java_support'Brad King2011-07-264-0/+960
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1417a55 Java: Fix documentation format and indentation 0b7627d Java: Use set_property/get_property for target variables. b01a505 Java: Create correct jar archive dependencies. f99c312 Java: Added some dependency magic to avoid recompilations. f3233ba Java: Create java_class_filelist only if it does't exist. a22ed3d Tests: Check for the new Java exeutable variables. c177c8e Tests: Java tests should test UseJava.cmake 5c2106c Modules: Added CMake Java support. a4b6275 FindJava: Find missing java development executables.
| * | | Java: Fix documentation format and indentationAndreas Schneider2011-06-201-169/+162
| | | |
| * | | Java: Use set_property/get_property for target variables.Andreas Schneider2011-06-201-37/+77
| | | |
| * | | Java: Create correct jar archive dependencies.Oliver Buchtala2011-04-041-5/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The command generating the jar file depends on java_class_filelist which is generated by another command. Signed-off-by: Andreas Schneider <asn@cryptomilk.org>
| * | | Java: Added some dependency magic to avoid recompilations.Oliver Buchtala2011-04-041-2/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Compile java sources within a custom_command using automatically checked file dependencies and create java_class_filelist after java compile. Signed-off-by: Andreas Schneider <asn@cryptomilk.org>
| * | | Java: Create java_class_filelist only if it does't exist.Oliver Buchtala2011-04-041-1/+3
| | | | | | | | | | | | | | | | Signed-off-by: Andreas Schneider <asn@cryptomilk.org>
| * | | Modules: Added CMake Java support.Andreas Schneider2011-03-293-0/+897
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This provides: find_jar add_jar install_jar install_jni_symlink create_javadoc
| * | | FindJava: Find missing java development executables.Andreas Schneider2011-03-291-0/+18
| | | |
* | | | Merge topic 'revert-fixbug_0004147'Brad King2011-06-281-59/+0
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | fc04531 Revert "Add a new function SWIG_GET_WRAPPER_DEPENDENCIES to UseSWIG.cmake"
| * | | | Revert "Add a new function SWIG_GET_WRAPPER_DEPENDENCIES to UseSWIG.cmake"Brad King2011-06-271-59/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 1088b0278e74526298d0821589973918da33c44b. Wrapper dependency scanning (fix for #4147) does not work at CMake configuration time if an input file is provided by a custom command (regression #12307). Revert to original behavior until a solution is found.
* | | | | Merge topic 'use_devenv_forvs2010'Brad King2011-06-241-9/+20
|\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8555c2b Look for VCExpress as a possible build tool as well as devenv. ed0075b Use relative paths for custom command inputs. 38368d5 Revert "With very long file names, VS 2010 was unable to compile files." 8cd66dc Use devenv instead of msbuild for vs2010.
| * | | | Use devenv instead of msbuild for vs2010.Bill Hoffman2011-06-211-9/+20
| | | | |
* | | | | Merge topic 'FindJNI-Fedora-issue-12276'Brad King2011-06-201-0/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 93fc629 FindJNI: Search in Fedora arch-specific JVM location (#12276)
| * | | | | FindJNI: Search in Fedora arch-specific JVM location (#12276)Christoph Höger2011-06-151-0/+1
| | |_|_|/ | |/| | |
* | | | | 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.