summaryrefslogtreecommitdiffstats
path: root/Source/cmake.cxx
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'fix-12446-no-cmake-E-build'David Cole2011-09-071-1/+0
|\ | | | | | | | | 96d106a CMake: Remove documentation for -E build (#12446)
| * CMake: Remove documentation for -E build (#12446)Matt McCormick2011-09-061-1/+0
| | | | | | | | | | | | The '-E build build_dir' command was created and documented, but then morphed into '--build build_dir' instead, ... and then the -E documentation was never removed. This commit fixes that oversight.
* | CMake: Add SaveCache at the end of successful Generate callsDavid Cole2011-09-011-0/+7
|/ | | | | | | Without this call, recent refactoring changes in the Visual Studio generators yield no GUIDs saved in the cache. Putting the SaveCache here *once* avoids scattering many calls to it in specific generators.
* Merge topic 'UsingCMakeLikePkgConfig2'David Cole2011-08-251-7/+128
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * Replace cmake::GetScriptMode() with GetWorkingMode()Alex Neundorf2011-08-091-8/+7
| | | | | | | | | | | | | | 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-021-0/+25
| | | | | | | | | | | | | | | | -add command line argument --find-package and handle it, i.e. call an empty function cmake::FindPackage() -add basic help Alex
* | Fix bootstrap test with automocAlex Neundorf2011-08-171-2/+1
| | | | | | | | Alex
* | Add the cmake module required currently for automocAlex Neundorf2011-08-141-0/+7
| | | | | | | | Alex
* | Start implementing skeleton for automoc in cmakeAlex Neundorf2011-08-141-1/+2
| | | | | | | | Alex
* | Start work on automoc: add empty cmQtAutomoc classAlex Neundorf2011-08-071-0/+7
| | | | | | | | Alex
* | Merge topic 'split-stdout-stderr'David Cole2011-08-021-4/+5
|\ \ | | | | | | | | | | | | | | | | | | | | | a343bc1 RunSingleCommand: Avoid assignment in condition 642f100 RunSingleCommand: Add a OUTPUT_NORMAL flag. 856a9e4 RunSingleCommand: Replace verbose boolean with enum 4096066 RunSingleCommand: Fix indentation
| * | RunSingleCommand: Add a OUTPUT_NORMAL flag.Johan Björk2011-07-281-3/+3
| | | | | | | | | | | | | | | OUTPUT_NORMAL does no processing of the output streams, it just passes them through the same streams as they were received on.
| * | RunSingleCommand: Replace verbose boolean with enumJohan Björk2011-07-281-3/+4
| |/ | | | | | | | | No behaviour change, this prepares for adding a flag to skip the merging of output streams.
* | Merge topic 'SetPropertyAppendString'Brad King2011-07-261-2/+2
|\ \ | | | | | | | | | | | | 9dbba1b Fix #12342: Add APPEND_STRING option to set_property()
| * | Fix #12342: Add APPEND_STRING option to set_property()Alex Neundorf2011-07-151-2/+2
| |/ | | | | | | | | | | | | | | | | set_property() has APPEND, which creates a list. E.g. when appending to COMPILE_FLAGS a string is needed, not a list. With the APPEND_STRING option the value is append as string, not as list. Alex
* | Add VisualStudio 9 and 10 generators for Itanium platformMatej Hribernik2011-06-201-0/+6
|/
* Merge topic 'MoreGraphVizFeatures'Brad King2011-04-191-0/+1
|\ | | | | | | | | | | | | 08fa5dd Also generate dependers-graphviz files. 4f96a76 GRAPHVIZ_IGNORE_TARGETS is now a list of regular expressions 5698ad2 Make it possible to exlude external libs from dot files
| * Also generate dependers-graphviz files.Alex Neundorf2011-02-061-0/+1
| | | | | | | | | | | | | | | | | | | | | | With this commit, the --graphviz option now also generates dot files which show which other targets depend on some target. So, now there is * a global dot-file which shows all targets and dependencies * a dot file which shows on what a target Foo depends * a dot file which shows which other targets depend on Foo Alex
* | Merge topic 'cleanup-unused-variable-check'Brad King2011-03-311-22/+25
|\ \ | | | | | | | | | | | | | | | a4335a6 Fix unused cache warning after multiple configure iterations a75ebe3 Refine unused cache variable warning
| * | Fix unused cache warning after multiple configure iterationsBrad King2011-03-241-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The curses dialog (ccmake) allows variables to be specified on the command line. If any of these variables is used during any configure iteration or during generate we must not warn about it. The Qt dialog (cmake-gui) allows variables to be added and removed in the GUI interactively. If a variable is added, removed, and then added again we must still warn if it is unused.
| * | Refine unused cache variable warningBrad King2011-03-241-20/+20
| |/ | | | | | | | | List all unused variables in one warning. Cleanup implementation to run the check exactly once at the end of generation.
* | Merge topic 'fix-2828-more-info-in-script-mode'Brad King2011-02-221-5/+15
|\ \ | | | | | | | | | | | | | | | | | | a58ace6 Fix KWStyle line-too-long complaint (#2828) 106958c Add CMAKE_ARGC and CMAKE_ARGV0..N-1 variables (#2828) 94d1684 Add CMAKE_SCRIPT_MODE_FILE variable (#2828)
| * | Fix KWStyle line-too-long complaint (#2828)David Cole2011-02-041-1/+2
| | |
| * | Add CMAKE_ARGC and CMAKE_ARGV0..N-1 variables (#2828)David Cole2011-02-031-5/+8
| | | | | | | | | | | | For now, these variables are only available in -P script mode.
| * | Add CMAKE_SCRIPT_MODE_FILE variable (#2828)David Cole2011-02-021-0/+6
| |/ | | | | | | | | New CMake variable is set when processing a -P script file, but not when configuring a project.
* | Merge topic 'fix-10704-manifest-no-vs10'Brad King2011-02-221-1/+4
|\ \ | | | | | | | | | | | | | | | fbca267 VS: Only use /MANIFEST if hasManifest is true (#11216) 98b448e VS2010: Fixed GenerateManifest flag (#10704)
| * | VS: Only use /MANIFEST if hasManifest is true (#11216)David Cole2011-02-091-1/+4
| |/ | | | | | | Thanks to Jörg Riedel for the patch.
* | Merge topic 'disallow-funny-path-names'Brad King2011-02-221-0/+24
|\ \ | | | | | | | | | | | | 8704525 Reject directory names containing '=' (#11689)
| * | Reject directory names containing '=' (#11689)Brad King2011-01-141-0/+24
| | | | | | | | | | | | | | | | | | Some characters are not well-supported by native build systems. Reject paths containing such characters before even trying to configure a project.
* | | Documentation: Sync two differing copies of -E docs (#10446)David Cole2011-02-041-9/+11
| |/ |/| | | | | Alphabetize both lists. Put platform-specific docs in both places too.
* | Merge branch 'dev/add_test-working-directory' into dev/strict-modeBrad King2011-01-271-2/+5
|\ \ | |/ | | | | | | Conflicts: Tests/CMakeLists.txt
| * Fix incremental linking for VS2010 with nmake or make.Bill Hoffman2010-12-091-0/+4
| | | | | | | | | | | | VS2010 deprecated /INCREMENTAL:YES. This change makes /INCREMENTAL the flag to use for incremental linking with VS2010.
| * Merge topic 'dev/fix-cache-variable-parsing-ambiguity'David Cole2010-11-231-2/+1
| |\ | | | | | | | | | | | | | | | | | | | | | 8b143fa Condense parsing of cache entries 122ebf1 Support manual cache entries 90abc3a Use cmCacheManager to load entries from the cache 6fe8624 Fix parsing of cache variables without a type
| | * Condense parsing of cache entriesBen Boeckel2010-11-221-2/+1
| | | | | | | | | | | | | | | If a cache line is being parsed, it shouldn't matter whether it has a type or not; just parse it however possible.
* | | Add method to unwatch a manual variableBen Boeckel2011-01-131-0/+8
| | |
* | | Give a better message for unused variablesBen Boeckel2011-01-131-1/+1
| | |
* | | Merge branch 'ImprovedDotSupport2' into dev/strict-modeBrad King2010-12-171-306/+80
|\ \ \ | |/ / | | | | | | | | | Conflicts: Source/cmake.cxx
| * | Move the code for generating dot-files into separate class cmGraphVizWriterAlex Neundorf2010-11-091-324/+12
| | | | | | | | | | | | Alex
| * | Generate separate dot files for each target, and a big one with everything.Alex Neundorf2010-10-311-68/+140
| | | | | | | | | | | | | | | | | | | | | | | | The big all-in-one file is basically unusable for e.g. kdelibs, it contains around 1000 nodes and the created image is huuuuge ! Too big actually to be displayable or viewable or comprehensable. Alex
| * | Properly insert all targets, also those which don't link to anything.Alex Neundorf2010-10-311-84/+45
| | | | | | | | | | | | Alex
| * | Move the code for collecting targets and libraries into separate functionsAlex Neundorf2010-10-311-82/+126
| | | | | | | | | | | | | | | | | | | | | Found bug: targets which don't link to anything don't get inserted in the dot file. Alex
| * | Remove trailing whitespace and minor formatting changes for the dot-codeAlex Neundorf2010-10-311-97/+107
| |/ | | | | | | Alex
| * Merge topic 'vs-project-groups'Brad King2010-10-051-1/+1
| |\ | | | | | | | | | | | | fd3249e New USE_FOLDERS property OFF by default. (#3796)
| | * New USE_FOLDERS property OFF by default. (#3796)David Cole2010-10-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Visual Studio Express editions do not support solution folders, so default behavior should be as if USE_FOLDERS global property is OFF. Also, allow folder names to be the same as target names: internally, use a prefix to distinguish folder GUIDs from target GUIDs. Add a target and folder with the same name in the ExternalProject test to exercise this code. For CMake itself, provide a new option CMAKE_USE_FOLDERS that defaults to ON so that Visual Studio users get a nicely organized CMake project. Express edition users will have to turn off the CMAKE_USE_FOLDERS option in order to build CMake in the VS Express IDE.
* | | Merge branch 'cmake-guiRememberAdvancedCheckbox' into dev/strict-modeBrad King2010-12-171-0/+35
|\ \ \ | |/ / | | | | | | | | | Conflicts: Source/QtDialog/CMakeSetupDialog.cxx
| * | Add a delay after untar on windows to make external project work on windows 7Bill Hoffman2010-09-211-0/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | OK, on windows 7 after we untar some files, sometimes we can not rename the directory after the untar is done. This breaks the external project untar and rename code. So, by default we will wait 1/10th of a second after the untar. If CMAKE_UNTAR_DELAY is set in the env, its value will be used instead of 100.
| * | Merge topic 'vs-project-groups'Brad King2010-09-081-0/+17
| |\ \ | | |/ | | | | | | | | | e6ac0aa Add FOLDER target property, for IDEs (#3796)
| | * Add FOLDER target property, for IDEs (#3796)David Cole2010-09-031-0/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This work was started from a patch by Thomas Schiffer. Thanks, Thomas! See the newly added documentation of the FOLDER target property for details. Also added global properties, USE_FOLDERS and PREDEFINED_TARGETS_FOLDER. See new docs here, too. By default, the FOLDER target property is used to organize targets into folders in IDEs that have support for such organization. This commit adds "solution folder" support to the Visual Studio generators. Currently works with versions 7 through 10. Also, use the new FOLDER property in the ExternalProject test and in the CMake project itself.