summaryrefslogtreecommitdiffstats
path: root/Modules
Commit message (Collapse)AuthorAgeFilesLines
* Modules: Add support for more java archives in add_jar().Andreas Schneider2011-08-291-1/+4
|
* Merge topic 'UsingCMakeLikePkgConfig2'David Cole2011-08-251-0/+187
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 59238dc Fix --find-package mode on Cygwin, where enable_language(RC) is called 98472e4 Require the current cmake version in --find-package mode a6ccf3c Use $(CXXFLAGS) and $(LDFLAGS) in the --find-package test Makefile 4386918 Fix line length 7d69310 Only enable the test when using GNU make 3011149 Make the test harder by always having a space in the include dirs ab57ff6 Make the --find-package test harder 626fc71 Much improved test, should now be executed on all UNIXes ec6982d Disable any STATUS output in --find-package mode e552ae7 Dont check for -isysroot and -mmacosx-version on OSX in --find-package mode e589589 Rename helper macros print_compile_flags() to set_compile_flags_var() aecfc1f Fix test on OpenBSD with BSD make 6bb4ca3 The makefile for the test was kindof wrong fd15b5e Only run the test if we are using a makefile generator under UNIX 9fc87c6 Add a test for the new --find-package mode d3ae0ff Improve documentation for --find-package mode bf07375 Add a cmake.m4 for using cmake in autoconf projects instead of pkgconfig b0e3578 Use the file-utility to test for 64bit if there is no /usr/lib64 53edfb2 Better support for lib64 and Debian multiarch b8fdaa1 Fix copyright notice in new CMakeFindPackageMode.cmake 7690edf Replace cmake::GetScriptMode() with GetWorkingMode() e4f603b Implement find-package mode of cmake a91d662 Add find-package mode, which does nothing yet b976e70 Make clLocalGenerator::GetTargetFlags() public
| * Fix --find-package mode on Cygwin, where enable_language(RC) is calledAlex Neundorf2011-08-221-0/+6
| | | | | | | | | | | | | | | | In --find-package mode we can't enable a language, since a lot of stuff has not been set up, e.g. which make tool to use. So disable enable_language() in this mode. Alex
| * Require the current cmake version in --find-package modeAlex Neundorf2011-08-221-0/+3
| | | | | | | | | | | | | | | | This fixes the problem that otherwise Platforms/CYGWIN.cmake doesn't know whether it should set WIN32 or not. Now it uses always the current behaviour. Alex
| * Dont check for -isysroot and -mmacosx-version on OSX in --find-package modeAlex Neundorf2011-08-151-0/+6
| | | | | | | | Alex
| * Rename helper macros print_compile_flags() to set_compile_flags_var()Alex Neundorf2011-08-151-4/+4
| | | | | | | | | | | | | | | | The same for print_link_flags(), it is now set_link_flags_var(). Both macros don't print anything anymore, this was only in the beginning. Alex
| * Improve documentation for --find-package modeAlex Neundorf2011-08-111-6/+10
| | | | | | | | Alex
| * Add a cmake.m4 for using cmake in autoconf projects instead of pkgconfigAlex Neundorf2011-08-111-1/+1
| | | | | | | | | | | | | | This file has been written today from scratch by Matthias Kretz and it BSD-licensed. Alex
| * Use the file-utility to test for 64bit if there is no /usr/lib64Alex Neundorf2011-08-091-2/+9
| | | | | | | | Alex
| * Better support for lib64 and Debian multiarchAlex Neundorf2011-08-091-3/+26
| | | | | | | | | | | | | | | | | | | | | | | | If CMAKE_SIZEOF_VOID_P is not set from the outside, it checks for the existance of /usr/lib64, and if it exists, SIZEOF_VOID_P is set to 8. For multiarch, if this is debian and CMAKE_${LANGUAGE}_LANGUAGE_ARCHITECTURE has not been set, it globs for the files in /lib, and uses the first one which matches CMAKE_LIBRARY_ARCHITECTURE_REGEX. Alex
| * Fix copyright notice in new CMakeFindPackageMode.cmakeAlex Neundorf2011-08-091-0/+13
| | | | | | | | Alex
| * Implement find-package mode of cmakeAlex Neundorf2011-07-021-0/+125
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In find-package mode, cmake executes Modules/CMakeFindPackage.cmake, which calls find_package(), and this is then evaluated in cmake.cxx, which prints an appropriate message to stdout, so it can be used e.g. in a normal Makefile: $ /opt/cmake-HEAD/bin/cmake --find-package -DNAME=JPEG -DCOMPILER_ID=GNU -DLANGUAGE=C -DMODE=EXIST JPEG found. $ /opt/cmake-HEAD/bin/cmake --find-package -DNAME=JPEG -DCOMPILER_ID=GNU -DLANGUAGE=C -DMODE=COMPILE $ /opt/cmake-HEAD/bin/cmake --find-package -DNAME=JPEG -DCOMPILER_ID=GNU -DLANGUAGE=C -DMODE=LINK -rdynamic -ljpeg Alex
* | Merge topic 'fix-11333-use-correct-thread-flags'David Cole2011-08-252-20/+29
|\ \ | | | | | | | | | | | | | | | 6b3993b CheckSymbolExists: Use IMMEDIATE flag for configure_file (#11333) fd61be7 FindThreads: Try pthreads with no special option first (#11333)
| * | CheckSymbolExists: Use IMMEDIATE flag for configure_file (#11333)David Cole2011-08-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The test "complex" sets the variable CMAKE_BACKWARDS_COMPATIBILITY to 1.4. When that variable is set, configure_file does not default to IMMEDIATE mode processing. And so, the output file likely does not exist yet by the time the next line in the CMakeLists.txt file is processed. When that next line is "try_compile" on that file, this is a problem. Fix the problem by explicitly using IMMEDIATE in the configure_file call. This problem was quite mysterious, as it only showed up on the "complex" test, when the previous commit introduced a CheckSymbolExists call into the FindThreads module. Which is not even explicitly included in the "complex" test... FindThreads gets included indirectly only as a side effect of setting CMAKE_BACKWARDS_COMPATIBILITY to 1.4 and even then it's included indirectly by auto-inclusion of CMakeBackwardCompatibilityC.cmake... Wow. Just wow.
| * | FindThreads: Try pthreads with no special option first (#11333)Rolf Eike Beer2011-08-201-19/+28
| | | | | | | | | | | | | | | | | | | | | QNX has the phtread stuff in the standard library. The best way would IMHO be to check if a program that uses pthread_* can be successfully linked without specifying any linker option before trying out the different flags.
* | | Merge topic 'AutomocForQt'David Cole2011-08-251-0/+13
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 920a046 QtAutomoc: Eliminate compiler warning b00463f QtAutomoc test: Pass QT_QMAKE_EXECUTABLE e78ce44 Fix automoc with VS builds: apply patch from Bill 71165e9 Silence warning in automoc: use long instead of int 1879bcc Fix build: use std::ios::out|ios::trunc instead of std::ios_base::out 678e124 Only enable the automoc test after checking that Qt4 works 71c29d1 Fix bootstrap test with automoc afb3edc Fix warnings add30e9 Fix build: non-void function must return a value 7e6d845 Automoc.cmake is not needed anymore 2963d0b Fix logic which decides when to execute automoc test 77a5c6e Add documentation for AUTOMOC, add initialization via CMAKE_AUTOMOC bf8ef77 Add a test for automoc d045fd4 Nicer progress message for the automoc target 50cd6ce Move automoc processing from add_executable/library to cmGlobalGenerator cbaac2a Remove trailing whitespace c27607b Refactor SetupAutomocTarget() so it can be run after creating the target 24d9b7d Remove trailing whitespace 58b7fe6 Use cout instead of printf() 72caf4d Add the generated automoc.cpp file to the cleaned files ddb517d Color output when running moc 9303295 Initialize verbose based onb the env.var. ace1215 Move code for parsing a cpp-file from the big loop to separate function 735a5bb Fix line lengths 83b730c Add AUTOMOC to the add_library() command 126c6ea Add the cmake module required currently for automoc de91feb Remove the need to check for .h/.cxx during buildtime d65689a Add actual automoc code from automoc d1c0a5f Start implementing skeleton for automoc in cmake a65011b Start work on automoc: add empty cmQtAutomoc class
| * | | Automoc.cmake is not needed anymoreAlex Neundorf2011-08-161-158/+0
| | | | | | | | | | | | | | | | | | | | | | | | (actually I thought I had already removed it again) Alex
| * | | Add the cmake module required currently for automocAlex Neundorf2011-08-142-0/+171
| | | | | | | | | | | | | | | | Alex
* | | | Merge topic 'fix_vcexpress_2010'David Cole2011-08-251-7/+22
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 3ca1df8 Use MSBuild when devenv is not around, since VCExpress seems broken.
| * | | | Use MSBuild when devenv is not around, since VCExpress seems broken.Bill Hoffman2011-08-181-7/+22
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | To support Intel Fortran, CMake started using devenv and VCExpress for build tools with VS2010. However, VCExpress does not always work. This change makes CMake use MSBuild when devenv is not found. This should be OK, since Intel Fortran can not be used with VCExpress.
* | | | Merge topic 'FixOptionalEnableAsm'David Cole2011-08-252-5/+15
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | cd70f00 Fix #12358: make optionally enabling ASM work again
| * | | | Fix #12358: make optionally enabling ASM work againAlex Neundorf2011-08-162-5/+15
| |/ / / | | | | | | | | | | | | Alex
* | | | Merge topic 'FindLAPACK_FindBLAS'David Cole2011-08-252-67/+118
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | cfad24a fixed: search of ATLAS library for C/C++-only projects d5e6030 ACML-GPU supportede af4c58b ACML-GPU supported 91b76e2 gotoblas supported 66a4bd0 fixed: search of acml libraries
| * | | fixed: search of ATLAS library for C/C++-only projectsAlexey Ozeritsky2011-08-151-3/+3
| | | |
| * | | ACML-GPU supportedeAlexey Ozeritsky2011-08-131-2/+2
| | | |
| * | | ACML-GPU supportedAlexey Ozeritsky2011-08-131-11/+43
| | | |
| * | | gotoblas supportedAlexey Ozeritsky2011-08-112-1/+30
| | | |
| * | | fixed: search of acml librariesAlexey Ozeritsky2011-08-112-56/+46
| |/ /
* | | Merge topic 'FindGetTextImprovements'David Cole2011-08-161-7/+94
|\ \ \ | | | | | | | | | | | | | | | | | | | | bebb2bc Support REQUIRED in FindGettext.cmake (using FPHSA.cmake) 431c8eb Add macros GETTEXT_PROCESS_POT() and GETTEXT_PROCESS_PO_FILES()
| * | | Support REQUIRED in FindGettext.cmake (using FPHSA.cmake)Alex Neundorf2011-08-101-0/+3
| | | | | | | | | | | | | | | | Alex
| * | | Add macros GETTEXT_PROCESS_POT() and GETTEXT_PROCESS_PO_FILES()Alex Neundorf2011-08-101-7/+91
| |/ / | | | | | | | | | | | | | | | | | | These macros (functions actually) can be used to process pot and po files. Patch prepared by Raphael Kubo da Costa. Alex
* | | Merge topic 'fix-12323-more-paths-in-finddcmtk'David Cole2011-08-161-2/+4
|\ \ \ | | | | | | | | | | | | | | | | 0167cea Add more find_path locations for DCMTK header files (#12323)
| * | | Add more find_path locations for DCMTK header files (#12323)David Cole2011-08-091-2/+4
| |/ /
* | | Merge topic 'fix-clang-flag-check-issue-12394'David Cole2011-08-162-0/+2
|\ \ \ | | | | | | | | | | | | | | | | ed6be50 Fix CHECK_(C|CXX)_COMPILER_FLAG for Clang (#12394)
| * | | Fix CHECK_(C|CXX)_COMPILER_FLAG for Clang (#12394)Brad King2011-08-082-0/+2
| |/ / | | | | | | | | | | | | This compiler warns and returns 0 for unrecognized flags. We fix the compiler flag check macros by looking for a warning in the output.
* | | Merge topic 'WriteConfigVersionFile_2TemplateFiles'David Cole2011-08-163-0/+136
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c9761de Improve documentation for WriteBasicConfigVersionFile.cmake 208bb90 Set UNSUITABLE instead of not COMPATIBLE bb03c2d Really fix copyright notice d50a61a Fix copyright notice 4ba09bc Add some tests for write_basic_config_version_file() 02b1e4b Add example to documentation d216a67 Provide macro write_basic_config_version_file()
| * | | Improve documentation for WriteBasicConfigVersionFile.cmakeAlex Neundorf2011-08-053-11/+13
| | | | | | | | | | | | | | | | Alex
| * | | Set UNSUITABLE instead of not COMPATIBLEAlex Neundorf2011-08-052-38/+31
| | | | | | | | | | | | | | | | Alex
| * | | Really fix copyright noticeAlex Neundorf2011-08-011-1/+1
| | | | | | | | | | | | | | | | Alex
| * | | Fix copyright noticeAlex Neundorf2011-08-011-3/+12
| | | | | | | | | | | | | | | | Alex
| * | | Add some tests for write_basic_config_version_file()Alex Neundorf2011-08-012-0/+4
| | | | | | | | | | | | | | | | Alex
| * | | Add example to documentationAlex Neundorf2011-08-011-0/+7
| | | | | | | | | | | | | | | | Alex
| * | | 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 'FindX11ImprovementsFromKDE'David Cole2011-08-161-13/+40
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | 6899e58 Also search for libxkbfile, XSync and SM include dir fe6bb7a Remove trailing whitespace
| * | | | Also search for libxkbfile, XSync and SM include dirAlex Neundorf2011-08-031-0/+27
| | | | | | | | | | | | | | | | | | | | Alex
| * | | | Remove trailing whitespaceAlex Neundorf2011-08-031-13/+13
| | |/ / | |/| | | | | | | | | | Alex
* | | | Merge topic 'fix-12054-eliminate-findjava-noise'David Cole2011-08-161-5/+0
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | f462369 remove extra output message from FindJava.cmake
| * | | | remove extra output message from FindJava.cmakeRolf Eike Beer2011-08-031-5/+0
| |/ / / | | | | | | | | | | | | | | | | FPHSA already prints out the version number. And this line was printed on every subsequent CMake run.
* | | | Merge topic 'fix-old-VisualAge-Fortran'David Cole2011-08-161-0/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | ad542d8 XL: Fix old VisualAge branding of Fortran compiler
| * | | | XL: Fix old VisualAge branding of Fortran compilerBrad King2011-08-021-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit 6d434ee6 (Split XL compiler information files, 2009-09-30) added Platform/AIX-(XL|VisualAge)-(C|CXX|Fortran).cmake modules to support the old and new compiler branding for all languages. Add the "AIX-VisualAge-Fortran" combination that was left out accidentally.