summaryrefslogtreecommitdiffstats
path: root/Source
Commit message (Collapse)AuthorAgeFilesLines
* 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 'UsingCMakeLikePkgConfig2'David Cole2011-08-256-25/+181
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 line lengthAlex Neundorf2011-08-181-1/+2
| | | | | | | | | | | | | | | | 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
| * | | Improve documentation for --find-package modeAlex Neundorf2011-08-111-1/+3
| | | | | | | | | | | | | | | | 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-021-2/+98
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 'AutomocForQt'David Cole2011-08-2517-74/+990
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | | | |
| * | | | Fix automoc with VS builds: apply patch from BillAlex Neundorf2011-08-184-39/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch moves the creation of VS GUIDs from the final pass to AddHelperCommands() and should fix the failing automoc tests with VS. Alex
| * | | | Silence warning in automoc: use long instead of intAlex Neundorf2011-08-181-1/+1
| | | | | | | | | | | | | | | | | | | | Alex
| * | | | Fix build: use std::ios::out|ios::trunc instead of std::ios_base::outAlex Neundorf2011-08-181-2/+2
| | | | | | | | | | | | | | | | | | | | Alex
| * | | | Fix bootstrap test with automocAlex Neundorf2011-08-172-2/+3
| | | | | | | | | | | | | | | | | | | | Alex
| * | | | Fix warningsAlex Neundorf2011-08-161-6/+7
| | | | | | | | | | | | | | | | | | | | Alex
| * | | | Fix build: non-void function must return a valueAlex Neundorf2011-08-161-1/+1
| | | | | | | | | | | | | | | | | | | | Alex
| * | | | Add documentation for AUTOMOC, add initialization via CMAKE_AUTOMOCAlex Neundorf2011-08-162-1/+33
| | | | | | | | | | | | | | | | | | | | Alex
| * | | | Nicer progress message for the automoc targetAlex Neundorf2011-08-161-2/+4
| | | | | | | | | | | | | | | | | | | | Alex
| * | | | Move automoc processing from add_executable/library to cmGlobalGeneratorAlex Neundorf2011-08-154-41/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now automoc is enabled by setting the AUTOMOC target property to true, instead of using the AUTOMOC keyword in add_executable() or add_library() Alex
| * | | | Remove trailing whitespaceAlex Neundorf2011-08-151-14/+14
| | | | | | | | | | | | | | | | | | | | Alex
| * | | | Refactor SetupAutomocTarget() so it can be run after creating the targetAlex Neundorf2011-08-154-64/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This makes it easier to move it from InitialPass() to some other location, e.g. FinalPass() or something else. Alex
| * | | | Remove trailing whitespaceAlex Neundorf2011-08-151-6/+6
| | | | | | | | | | | | | | | | | | | | Alex
| * | | | Use cout instead of printf()Alex Neundorf2011-08-141-8/+8
| | | | | | | | | | | | | | | | | | | | Alex
| * | | | Add the generated automoc.cpp file to the cleaned filesAlex Neundorf2011-08-141-0/+2
| | | | | | | | | | | | | | | | | | | | Alex
| * | | | Color output when running mocAlex Neundorf2011-08-142-8/+23
| | | | | | | | | | | | | | | | | | | | Alex
| * | | | Initialize verbose based onb the env.var.Alex Neundorf2011-08-141-1/+1
| | | | | | | | | | | | | | | | | | | | Alex
| * | | | Move code for parsing a cpp-file from the big loop to separate functionAlex Neundorf2011-08-142-183/+186
| | | | | | | | | | | | | | | | | | | | Alex
| * | | | Fix line lengthsAlex Neundorf2011-08-141-49/+60
| | | | | | | | | | | | | | | | | | | | Alex
| * | | | Add AUTOMOC to the add_library() commandAlex Neundorf2011-08-143-13/+42
| | | | | | | | | | | | | | | | | | | | Alex
| * | | | Add the cmake module required currently for automocAlex Neundorf2011-08-145-1/+169
| | | | | | | | | | | | | | | | | | | | Alex
| * | | | Remove the need to check for .h/.cxx during buildtimeAlex Neundorf2011-08-142-144/+143
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead it now relies on cmake time to put that information correctly into AutomocInfo.cmake Alex
| * | | | Add actual automoc code from automocAlex Neundorf2011-08-142-6/+589
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It already works :-) Needs more refactoring, e.g. using the cmake facilities to turn a string into a vector etc. Also still missing is the part which creates the custom target. Alex
| * | | | Start implementing skeleton for automoc in cmakeAlex Neundorf2011-08-143-1/+100
| | | | | | | | | | | | | | | | | | | | Alex
| * | | | Start work on automoc: add empty cmQtAutomoc classAlex Neundorf2011-08-074-0/+30
| | | | | | | | | | | | | | | | | | | | Alex
* | | | | Merge topic 'xcode4-remove-PREBINDING'David Cole2011-08-251-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | bda4148 Xcode: Remove PREBINDING attribute for Xcode 4 and above
| * | | | | Xcode: Remove PREBINDING attribute for Xcode 4 and aboveJohan Bjork2011-08-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PREBINDING is obsolete in Xcode 4 and causes warnings if present. Do not emit it for Xcode >= 4.0
* | | | | | Merge topic 'fix-vs10-rebuild-issue'David Cole2011-08-251-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | eb02acb VS10: Avoid unnecessary rebuilds for custom commands
| * | | | | | VS10: Avoid unnecessary rebuilds for custom commandsDavid Cole2011-08-181-1/+1
| | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | Thanks to James Bigler for pointing this out on the cmake-developers mailing list...
* | | | | | KWSys Nightly Date StampKWSys Robot2011-08-251-1/+1
| | | | | |
* | | | | | KWSys Nightly Date StampKWSys Robot2011-08-241-1/+1
| |_|_|_|/ |/| | | |
* | | | | KWSys Nightly Date StampKWSys Robot2011-08-231-1/+1
| | | | |
* | | | | KWSys Nightly Date StampKWSys Robot2011-08-221-1/+1
| | | | |