summaryrefslogtreecommitdiffstats
path: root/Source/cmake.cxx
Commit message (Collapse)AuthorAgeFilesLines
* Ninja: move -LIBPATH behind -link optionPeter Kümmel2012-10-011-1/+5
| | | | Don' pass linker option to the compile
* Revert "Ninja: don't expand any rsp files"Bill Hoffman2012-10-011-15/+7
| | | | | | | | | This reverts commit 5598d9b2a06d4ec788b5e058435bb3bba99fd517. Since commit f1670ab1 (Ninja: don't confuse ninja's rsp files with nmake's, 2012-09-26) Ninja generator response files are placed in CMakeFiles/ so the previously existing check already avoids expanding them.
* Merge topic 'use-generator-target'David Cole2012-09-251-1/+2
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 879fd35 Revert "Move GenerateTargetManifest to cmGeneratorTarget." 6674583 Fix compiler warning with initialization order. 5285458 Add convenience for getting a cmGeneratorTarget to use. c31f3d9 Add a wrapper for accessing config-specific compile-definitions. d1446ca Append the COMPILE_DEFINITIONS from the Makefile to all targets. 290e92a Move GetIncludeDirectories to cmGeneratorTarget. f9146f6 Port cmLocalGenerator::GetTargetFlags to cmGeneratorTarget. 9facfd1 Move GetCreateRuleVariable to cmGeneratorTarget. 78bfee3 Make cmLocalGenerator::AddArchitectureFlags take a cmGeneratorTarget. 4f5384e Move GetLinkInformation to cmGeneratorTarget 987e12e Move GenerateTargetManifest to cmGeneratorTarget. 14bf778 Store cmGeneratorTargets with the makefile. f428ca2 Add more forwarding API to cmGeneratorTarget.
| * Port cmLocalGenerator::GetTargetFlags to cmGeneratorTarget.Stephen Kelly2012-09-191-1/+2
| |
* | Merge topic 'vs-link-rsp'Brad King2012-09-191-7/+15
|\ \ | | | | | | | | | | | | 5598d9b Ninja: don't expand any rsp files
| * | Ninja: don't expand any rsp filesPeter Kuemmel2012-09-191-7/+15
| |/
* | VS11: Detect VS 2012 Express for default generator (#13348)Brad King2012-09-181-2/+5
|/ | | | | | | | | Add WDExpress to the list of registry search locations. Add VS 11 to the list of VS versions and corresponding generator names. Fix the search logic to use the most recent version found under any registry entry. Inspired-by: Peter Kümmel <syntheticpp@gmx.net>
* Merge topic 'ErrorIfCTEST_USE_LAUNCHERSSetButLauncherRuleNotSet'Brad King2012-08-301-0/+11
|\ | | | | | | | | 95e502e error out if CTEST_USE_LAUNCHERS is TRUE but RULE_LAUNCH_* are not set
| * error out if CTEST_USE_LAUNCHERS is TRUE but RULE_LAUNCH_* are not setAlex Neundorf2012-08-201-0/+11
| | | | | | | | | | | | | | | | | | | | Otherwise, CTEST_USE_LAUNCHERS can be set to true in a driving ctest script, and everything looks like it would work and reports 0 build errors, but actually there can be any amount of errors and they are just not reported. By adding this check cmake now errors out if CTEST_USE_LAUNCHERS is enabled, but the RULE properties are not set, which would lead to a not-working ctest run. Alex
* | Make platform information files specific to the CMake versionBrad King2012-08-241-3/+0
|/ | | | | | | | | | | | | | | | | | | | | | | | | | | At the top of a build tree we configure inside the CMakeFiles directory files such as "CMakeSystem.cmake" and "CMake<lang>Compiler.cmake" to save information detected about the system and compilers in use. The method of detection and the exact results store varies across CMake versions as things improve. This leads to problems when loading files configured by a different version of CMake. Previously we ignored such existing files only if the major.minor part of the CMake version component changed, and depended on the CMakeCache.txt to tell us the last version of CMake that wrote the files. This led to problems if the user deletes the CMakeCache.txt or we add required information to the files in a patch-level release of CMake (still a "feature point" release by modern CMake versioning convention). Ensure that we always have version-consistent platform information files by storing them in a subdirectory named with the CMake version. Every version of CMake will do its own system and compiler identification checks even when a build tree has already been configured by another version of CMake. Stored results will not clobber those from other versions of CMake which may be run again on the same tree in the future. Loaded results will match what the system and language modules expect. Rename the undocumented variable CMAKE_PLATFORM_ROOT_BIN to CMAKE_PLATFORM_INFO_DIR to clarify its purpose. The new variable points at the version-specific directory while the old variable did not.
* Merge topic 'directory-typo'David Cole2012-08-131-2/+2
|\ | | | | | | | | 6c8722f Fix typo direcotry -> directory (and similar) [#13444]
| * Fix typo direcotry -> directory (and similar) [#13444]Rolf Eike Beer2012-07-301-2/+2
| |
* | Merge topic 'use_normal_ouput_with_chdir'David Cole2012-08-131-1/+1
|\ \ | |/ |/| | | | | 4ddd3b9 Use OUTPUT_NORMAL instead of OUTPUT_MERGE for cmake -E chdir.
| * Use OUTPUT_NORMAL instead of OUTPUT_MERGE for cmake -E chdir.Bill Hoffman2012-07-201-1/+1
| | | | | | | | Using OUTPUT_MERGE can cause the output to be jumbled in some cases.
* | Ninja: enable ninja support everywherePeter Kümmel2012-07-201-5/+1
|/
* automoc: better error handling (#13299)Alex Neundorf2012-06-141-2/+2
| | | | | | | automoc now fails immediately if moc fails, instead of continuing and letting the build fail later on. Alex
* VS11: Add ARM architecture generator (#13077)Minmin Gong2012-05-091-0/+3
|
* Merge topic 'ninja-generator'Brad King2012-03-191-0/+8
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8485208 Ninja: shell escape $(CMAKE_SOURCE_DIR) and $(CMAKE_BINARY_DIR) df84767 Ninja: add support for OBJECT_OUTPUTS, fix PrecompiledHeader test case 48eb7fc Ninja: Avoid using 'this' in member initializers bba37dd Ninja: Fix for PDB files with spaces in the path. ac800f4 Ninja: Constify use of cmCustomCommand 9a0d5a8 Ninja: add /DEF: flag to linker call d40eebd Ninja: Add a cache option CMAKE_ENABLE_NINJA to enable the ninja generator. 8c63433 Ninja: Add friend struct so it can access the private ConvertToNinjaPath. dbe3dce Ninja: add .def file support f1bb08f Ninja: ensure the output dir exists at compile time 7a6b5f4 Ninja: Remove an unnecessary variable 80ff210 Ninja: Use cmSystemTools::ExpandListArgument to split compile/link commands d2731a3 Ninja: Add a missed license header eabc9b0 Ninja: CMake: Adapt Ninja generator for per-target include dirs bada88e Merge branch 'target-include-directories' into ninja-generator 54bd175 Ninja: windows msvc: create for each target a .pdb file ...
| * Merge branch 'target-include-directories' into ninja-generatorDavid Cole2012-02-221-40/+21
| |\
| * | Ninja: Add the Ninja generatorPeter Collingbourne2012-02-021-0/+8
| | |
* | | Merge topic 'target-include-directories'David Cole2012-03-081-7/+3
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d662dff Fix shadowed variable warning on dashboard results f66e735 Fix compiler warning reported on older Borland dashboard. d90eed4 Fix compiler error reported on older Borland dashboard. 8233636 Update the documentation regarding INCLUDE_DIRECTORIES. d899eb7 Call ExpandVariablesInString for each target's INCLUDE_DIRECTORIES c21db87 Make search paths ordered and unique 22021f0 Remove cmMakefile::GetIncludeDirectories 9106b56 Extract and use the INCLUDE_DIRECTORIES target properties. 840509b Keep the INCLUDE_DIRECTORIES target property up to date. a4d5f7b Add API to get the ordered includes for a target. 8adaee2 CMake: Eliminate cmMakefile::IncludeDirectories 7620932 Remove include flags memoization. 97a5faa Make it safe to call this method without creating duplicates. edd5303 Refactor GetIncludeFlags to take includes instead of fetching them
| * | Extract and use the INCLUDE_DIRECTORIES target properties.Stephen Kelly2012-02-221-9/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | Eliminate callers of cmMakefile::GetIncludeDirectories. All callers of GetIncludeDirectories should go through the local generator object. Only the local generator calls cmTarget::GetIncludeDirectories directly.
| * | Refactor GetIncludeFlags to take includes instead of fetching themStephen Kelly2012-02-221-1/+5
| | |
* | | Run vim spellcheck on some filesYury G. Kudryashov2012-02-291-8/+10
|/ /
* | Merge topic 'ImproveCPackDoc-reloaded'David Cole2012-02-141-1/+3
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d4b77eb Avoid discovering system infos for documentation. Adding some path is enough. 9002f73 Fix non existent std::string::clear on VS6 02ccb32 Create getDocumentedModulesListInDir which may be used in other context. 24fbc28 Add missing section markup for CPackComponent bafd8a9 Example of builtin variable documentation (i.e. only used in C++ source code). 543f1ad Make the load of script documentation more efficient and dynamic. cdbd1a9 Fix another compiler warning due to a typo 52c53de Really avoid compiler warning about unused vars 37f90ed Calm down compiler warning about unused var 7c82b7f Fix potential bad memory access, thanks to Eike 62b589b Suppress unused var, beautify code, avoid 1 extra newline. 751713f Update bash completion file in order to handle new CPack doc options. 1629615 CPack Documentation extraction from CMake script begins to work 83e34dd Implement simple CMake script comment markup language. c6a0169 CPack begin the implementation of --help-command* and --help-variables*
| * | CPack Documentation extraction from CMake script begins to workEric NOULARD2012-01-221-1/+3
| |/ | | | | | | | | | | | | | | | | | | - Enhance extract doc parser. Seems robust now. The legacy module documentation parser works as before ignoring the new markup. - Proof of concept for CPack (generic), CPack RPM and CPack Deb generator for macro and variables. Try cpack --help-command and cpack --help-variables
* | Merge topic 'warn-funny-path-names'David Cole2012-02-071-24/+0
|\ \ | | | | | | | | | | | | c8ef643 Allow directory names containing '=' and warn if necessary (#12934)
| * | Allow directory names containing '=' and warn if necessary (#12934)Brad King2012-02-061-24/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The approach taken by commit 8704525f (Reject directory names containing '=', 2011-01-14) was perhaps too heavy-handed for avoiding the obscure cases when '=' in the path fails due to limitations of Make syntax. Only two CMake tests: LinkDirectory OutOfSource fail when the path contains '=' and they cover obscure cases. Instead of rejecting such paths outright just warn when the problem may occur.
* | | Find VC Express during default generator selection (#12917)Peter Kuemmel2012-02-011-8/+15
| |/ |/| | | | | | | | | | | CMake doesn't find Visual C++ Express and uses "NMake Makefiles" generator by default when one calls cmake WITHOUT using the -G options. Teach CMake to find VC Express to use it as the default generator just like the commercial versions.
* | Fix typo.Nicolas Despres2011-10-231-2/+2
| |
* | Add Visual Studio 11 generator for x86 and x64 toolsBrad King2011-09-231-0/+6
| |
* | 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
generated by cgit v0.12 at 2024-10-31 15:01:53 (GMT)