summaryrefslogtreecommitdiffstats
path: root/Source/cmake.cxx
Commit message (Collapse)AuthorAgeFilesLines
* Fix spelling and typos (non-binary)Andreas Mohr2013-05-071-2/+2
|
* Fix spelling and typos (affecting binary data / module messages)Andreas Mohr2013-05-071-1/+1
|
* Fix spelling and typos (affecting users)Andreas Mohr2013-05-071-2/+2
|
* Merge topic 'sublime-text-2-generator'Brad King2013-02-191-0/+3
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f616ff2 Update generator to use new cmGeneratorTarget api. 674bd6e Merge branch 'master' into sublime-text-2-generator 4760ead Remove ability to generate sublime clang files. da0898e Correct missing parameter to CMP0018Flags call. badb40d Merge branch 'master' into sublime-text-2-generator b3ae61f Merge branch 'master' into sublime-text-2-generator 089d9cc SublimeText 2 Gen: Set the sublimeclang_options_script property. 44c2eee Merge branch 'master' into sublime-text-2-generator 304b885 Sublime Text 2 Gen: Per-source Compile flags are now saved in a separate file. 5b2aa3d SublimeText2 Gen: Fixed the issue where include directory flags used -D 90bcb77 SublimeText2 Gen: Improved use of define, include flags from CMAKE_C(XX)_FLAGS cc84072 Merge branch 'master' into sublime-text-2-generator 8670cbe Define flags in CMAKE_C(XX)_FLAGS are now included in SublimeClang settings. d022d4e Merge branch 'master' into sublime-text-2-generator 9cd3e70 Fixed Sublime Text project generation for in-source builds 44f35f7 Added a CMAKE_SUBLIMECLANG_DISABLED variable that disables SublimeClang. ...
| * Merge branch 'master' into sublime-text-2-generatorRobert Maynard2013-02-191-0/+17
| |\
| * \ Merge branch 'master' into sublime-text-2-generatorRobert Maynard2013-02-191-11/+45
| |\ \ | | | | | | | | | | | | | | | | Resolve conflict in Source/cmDocumentVariables.cxx by adding both variables.
| * \ \ Merge branch 'master' into sublime-text-2-generatorMorné Chamberlain2012-11-241-79/+68
| |\ \ \
| * | | | Added a generator for Sublime Text 2 project files.Morné Chamberlain2012-10-131-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The generator adds all list and source files for each defined project. The generated project files also include build_system entries that run the platform-specific make on the generated Makefiles. A build_system entry is created for each target that was defined in the CMakeLists.txt files. At the moment this has only been tested with C/C++ projects.
* | | | | Merge topic 'vs-atomic-generated-stamp'Brad King2013-02-151-3/+12
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 2dc17f8 VS: Replace generation timestamp file atomically
| * | | | | VS: Replace generation timestamp file atomicallyBrad King2013-02-121-3/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit 34c882a9 (Allow VS 7 project Rebuild and Solution Rebuild to work, 2007-11-10) we use a "CMakeFiles/generated.stamp" and some associated files in the build tree to avoid re-running CMake when the inputs have not changed but VS has cleaned the outputs it knows about. When we do not really need to re-run we restore the generated.stamp file. The non-re-run case can happen in multiple targets in parallel in VS >= 10 so we must restore the file atomically to avoid races. Write the stamp file to a random temporary name and then atomically rename it to the real stamp file.
* | | | | | Fix crash on empty CMAKE_<lang>_COMPILER value (#13901)Brad King2013-02-081-1/+1
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit fd33bf93 (fix for bug 6102, allow users to change the compiler, 2007-12-13) we keep an internal ;-list of language compiler variable and value pairs. Preserve empty values on expansion to ensure that the key/value pairing remains consistent.
* | | | | Merge branch 'master' into generator-toolsetBrad King2013-02-071-0/+4
|\ \ \ \ \ | | |_|_|/ | |/| | | | | | | | We need the latest Tests/CMakeLists.txt so we can refactor all tests.
| * | | | Output include directories as LOG messages, not warnings.Stephen Kelly2013-01-211-0/+4
| | | | |
* | | | | CMake: Add -T option to choose a generator toolsetBrad King2013-02-071-0/+55
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reject the option by default. It will be implemented on a per-generator basis. Pass the setting into try_compile project generation. Add cache entry CMAKE_GENERATOR_TOOLSET and associated variable documentation to hold the value persistently. Add a RunCMake.GeneratorToolset test to cover basic "-T" option cases. Verify that CMAKE_GENERATOR_TOOLSET is empty without -T, that -T is rejected when the generator doesn't support it, and that two -T options are always rejected.
* | | | Merge topic 'compatible-INTERFACE-user-properties'Brad King2013-01-151-0/+7
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 7171fd0 Add a way to check INTERFACE user property compatibility.
| * | | | Add a way to check INTERFACE user property compatibility.Stephen Kelly2013-01-151-0/+7
| | |_|/ | |/| |
* | | | CMake: Skip empty link.txt lines (#13845)Brad King2013-01-111-0/+6
|/ / / | | | | | | | | | | | | | | | In the implementation of "cmake -E cmake_link_script", skip lines from the input file that are empty or contain only whitespace. Do not try to run a child with no command line.
* | | Fix some warnings from -WundefStephen Kelly2012-12-221-1/+1
| | | | | | | | | | | | Other warnings come from kwsys, so the flag can't be enabled.
* | | Add command to generate environment for a Windows CE SDKPatrick Gansterer2012-11-301-0/+36
| | |
* | | Always use the auto_ptr from cmsys.Stephen Kelly2012-11-201-10/+8
| |/ |/| | | | | | | | | This is for consistency throughout cmake. The cmsys version exists becaues uses of auto_ptr types as return types does not work with some implementations in ancient compilers.
* | VS: Remove platform specific generator filesPatrick Gansterer2012-11-191-21/+0
| | | | | | | | Move the whole logic into the base class and the factory.
* | Allow a GeneratorFactory handling of more than one generatorPatrick Gansterer2012-11-191-58/+62
| | | | | | | | | | | | | | | | Pass the name of the requested generator to the generator factory, which is now responsible to check if it can create a matching generator for the name. This allows us to add more logic to the factory in a next step, so that not every possible generator needs to get registered explicit in cmake::AddDefaultGenerators().
* | Search generator in cmake::ExtraGenerators before in cmake::GeneratorsPatrick Gansterer2012-11-191-19/+22
| | | | | | | | | | | | Since ExtraGenerators does not contain items, which are in Generators too, there is not change in behaviour. The benefit of this change is, that the lookup in the Generators map is now only done once.
* | Add cmGlobalGeneratorFactory::GetGenerators()Patrick Gansterer2012-11-191-1/+1
| | | | | | | | | | This allows cmGlobalGeneratorFactory to create more than one type of cmGlobalGenerator in a next step.
* | Introduce the abstract class cmGlobalGeneratorFactoryPatrick Gansterer2012-11-191-27/+30
|/ | | | | This new abstract class allows us move some logic from the cmGlobalGenerator into its own layer in a next step.
* 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*