summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'fix-xcode4-test-failures'David Cole2011-09-011-1/+8
|\ | | | | | | | | 0cf4fa5 Xcode4: Requires more quoting of single quote char
| * Xcode4: Requires more quoting of single quote charDavid Cole2011-08-251-1/+8
| | | | | | | | | | | | | | | | Specifically in per-target and per-file compiler definition string values. The Preprocessor test now passes on Xcode 4 builds after this commit.
* | Merge topic 'AutomocForQt'David Cole2011-09-011-1/+1
|\ \ | | | | | | | | | | | | 7bf2c1a Create moc files in the current binary dir, not the top level.
| * | Create moc files in the current binary dir, not the top level.Stephen Kelly2011-08-251-1/+1
| | |
* | | KWSys: Fix std::string hash function for BorlandBrad King2011-09-011-0/+2
| | | | | | | | | | | | Borland ignores "const" qualifiers in template specializations.
* | | KWSys: Add hash function for std::stringBrad King2011-09-011-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | Added hashing fuction for std::string. This adds default support for std::strings to KWSys hashing containers. Author: Bradley Lowekamp <blowekamp@mail.nih.gov> Suggested-by: Arnaud Gelas <arnaud_gelas@hms.harvard.edu> Change-Id: I7e7a0c356b73d19868a3df1db57b702ec7fffe9d
* | | KWSys Nightly Date StampKWSys Robot2011-09-011-2/+2
| | |
* | | KWSys Nightly Date StampKWSys Robot2011-08-311-1/+1
| | |
* | | KWSys Nightly Date StampKWSys Robot2011-08-301-1/+1
| | |
* | | KWSys Nightly Date StampKWSys Robot2011-08-291-1/+1
| | |
* | | KWSys Nightly Date StampKWSys Robot2011-08-281-1/+1
| | |
* | | KWSys Nightly Date StampKWSys Robot2011-08-271-1/+1
| | |
* | | KWSys Nightly Date StampKWSys Robot2011-08-261-1/+1
| | |
* | | Merge topic 'fix-11690-preserve-xcode-objectids'David Cole2011-08-254-21/+89
|\ \ \ | | | | | | | | | | | | | | | | 1834f23 Xcode: Save object id values in CMakeCache.txt (#11690)
| * | | Xcode: Save object id values in CMakeCache.txt (#11690)David Cole2011-08-244-21/+89
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For project and target objects, save their ids in CMakeCache.txt. Hopefully, that will be enough to allow user settings to be saved across multiple CMake generate operations. Other object types may also need their ids saved: if so, more code than this commit will be necessary...
* | | | Merge topic 'fix_nmake_var_plus'David Cole2011-08-251-0/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 281f51e Fix for bug #12413, nmake did not handle targets with + in the name.
| * | | | Fix for bug #12413, nmake did not handle targets with + in the name.Bill Hoffman2011-08-241-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If you had a + in the name of a target with nmake, it created a variable in the makefile that used + in its name, which is not allowed by nmake. To make the implementation easier, + is now not allowed for any make generators as part of a variable name.
* | | | | Merge topic 're-suppress-warning'David Cole2011-08-251-0/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 1db6955 Xcode: Suppress same-old warning again.
| * | | | | Xcode: Suppress same-old warning again.David Cole2011-08-231-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | They changed the wording of it slightly with Xcode 4.
* | | | | | Merge topic 'UsingCMakeLikePkgConfig2'David Cole2011-08-2516-25/+491
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | Use $(CXXFLAGS) and $(LDFLAGS) in the --find-package test MakefileAlex Neundorf2011-08-181-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This should make the test succeed in the coverage builds, where CXXFLAGS and LDFLAGS are set accordingly. Alex
| * | | | | | Fix line lengthAlex Neundorf2011-08-181-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Alex
| * | | | | | Only enable the test when using GNU makeAlex Neundorf2011-08-171-10/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The makefile used in the test uses $(shell ...), which is AFAIK a GNU extension, and will probably not work e.g. with OpenBSD make. According to the FreeBSD make manpage their make has a != assignment, which seems to do something similar, but I don't have such a system around for testing. Also, the point of this test is not to write a portable makefile, but to check whether cmake --find-package prints a correct string. Alex
| * | | | | | Make the test harder by always having a space in the include dirsAlex Neundorf2011-08-171-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The commit message for the previous commit was wrong, it should have been: fix the test by using $(shell ...) syntax instead of backticks in the Makefile. With backticks I couldn't get the quoting right. Printing -I"/some/path with space" did not work, the compiler complained that there is not file "with". Also backslashes in different numbers did not make it work. Alex
| * | | | | | Make the --find-package test harderAlex Neundorf2011-08-171-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now it is guaranteed that the include paths always contain a space. This should make the cont. build fail. Alex
| * | | | | | Much improved test, should now be executed on all UNIXesAlex Neundorf2011-08-166-17/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of relying on that some development package is installed on the system, now a tiny library is built, which is the searched and used during the test. Alex
| * | | | | | Disable any STATUS output in --find-package modeAlex Neundorf2011-08-151-2/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Any STATUS output will be fed directly to the compiler, which will not understand any status messages. Error messages are fine, since they are errors and it is ok if the compiler fails in such cases. 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
| * | | | | | Fix test on OpenBSD with BSD makeAlex Neundorf2011-08-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BSD make doesn't seem to support -C, so do not use it, According to the documentation the working directory is set to CMAKE_CURRENT_BINARY_DIR anyway, so it should work just the same. Alex
| * | | | | | The makefile for the test was kindof wrongAlex Neundorf2011-08-141-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Alex
| * | | | | | Only run the test if we are using a makefile generator under UNIXAlex Neundorf2011-08-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Alex
| * | | | | | Add a test for the new --find-package modeAlex Neundorf2011-08-114-0/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Alex
| * | | | | | Improve documentation for --find-package modeAlex Neundorf2011-08-112-7/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Alex
| * | | | | | Add a cmake.m4 for using cmake in autoconf projects instead of pkgconfigAlex Neundorf2011-08-113-1/+55
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | Replace cmake::GetScriptMode() with GetWorkingMode()Alex Neundorf2011-08-095-31/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | GetWorkingMode() returns a new enum WorkingMode, which is one of NORMAL_MODE, SCRIPT_MODE and FIND_PACKAGE_MODE. Alex
| * | | | | | Implement find-package mode of cmakeAlex Neundorf2011-07-022-2/+223
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | Add find-package mode, which does nothing yetAlex Neundorf2011-07-024-2/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | -add command line argument --find-package and handle it, i.e. call an empty function cmake::FindPackage() -add basic help Alex
| * | | | | | Make clLocalGenerator::GetTargetFlags() publicAlex Neundorf2011-07-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will later on be used for getting the link flags 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-2525-74/+1917
|\ \ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | | QtAutomoc: Eliminate compiler warningDavid Cole2011-08-191-1/+1
| | | | | | | |
| * | | | | | | QtAutomoc test: Pass QT_QMAKE_EXECUTABLEDavid Cole2011-08-191-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ...in case qmake is not in the PATH