summaryrefslogtreecommitdiffstats
path: root/Source
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'doc-add_library-PIC'David Cole2012-09-042-2/+4
|\ | | | | | | | | 4eaea3c add_library: Document POSITION_INDEPENDENT_CODE default (#13479)
| * add_library: Document POSITION_INDEPENDENT_CODE default (#13479)Brad King2012-08-312-2/+4
| | | | | | | | | | | | | | | | | | | | The POSITION_INDEPENDENT_CODE property documentation states that its default value depends on whether SHARED or MODULE is given to the add_library call. Since these are options to the add_library command we should document on the command how they affect the property. While at it, add a missing space to the POSITION_INDEPENDENT_CODE property documentation.
* | CMake Nightly Date StampKitware Robot2012-09-041-1/+1
| |
* | CMake Nightly Date StampKitware Robot2012-09-031-1/+1
| |
* | CMake Nightly Date StampKitware Robot2012-09-021-1/+1
| |
* | CMake Nightly Date StampKitware Robot2012-09-011-1/+1
|/
* CMake Nightly Date StampKitware Robot2012-08-311-1/+1
|
* Merge topic 'fix-Qt-casing'Brad King2012-08-304-6/+6
|\ | | | | | | | | 3252149 Fix casing of 'Qt' in docs, comments and user-visible strings.
| * Fix casing of 'Qt' in docs, comments and user-visible strings.Stephen Kelly2012-08-284-6/+6
| | | | | | | | | | QT (cue-tea) is Apple QuickTime. Qt (cute) is the C++ framework.
* | Merge topic 'AutomocRerunFix'Brad King2012-08-302-6/+28
|\ \ | | | | | | | | | | | | b001b6e fix #13494: rerun automoc also if include dirs or moc options change
| * | fix #13494: rerun automoc also if include dirs or moc options changeAlex Neundorf2012-08-272-6/+28
| | | | | | | | | | | | | | | | | | | | | | | | Until now it was only rerun if the compile definitions changed, but of course it also has to rerun if the include dirs or moc options change. Strange that I didn't notice this before... Alex
* | | 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
* | | | Merge topic 'msvc-compiler-info'Brad King2012-08-3010-20/+0
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 32b7c72 Merge branch 'cmake-platform-info-version' into msvc-compiler-info f3ddfef Modernize MSVC compiler information files 485a940 VS: Simplify MSVC version reporting 32db033 VS: Remove support for "free" version 2003 tools
| * \ \ \ Merge branch 'cmake-platform-info-version' into msvc-compiler-infoBrad King2012-08-302-12/+4
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: Modules/CMakeTestCCompiler.cmake Modules/CMakeTestCXXCompiler.cmake Modules/Platform/Windows-cl.cmake
| * | | | | VS: Simplify MSVC version reportingBrad King2012-08-309-14/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Teach Windows-cl.cmake to use CMAKE_(C|CXX)_COMPILER_VERSION to set the "MSVC##" and MSVC_VERSION variables. It no longer needs the IDE generator to dictate the version or to detect the version by running the command-line tool for NMake and Ninja generators. Drop configuration of CMakeCPlatform.cmake and CMakeCXXPlatform.cmake from Windows-cl.cmake.in because all the results it saved are now cheap to compute every time.
| * | | | | VS: Remove support for "free" version 2003 toolsBrad King2012-08-231-6/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Several more recent Visual Studio Express editions are now available and they support debug builds. Simplify our VS platform files by removing support for these old tools. If anyone still uses them we can restore support with a more modern way to test for them.
* | | | | | Merge topic 'cmake-platform-info-version'Brad King2012-08-302-12/+4
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | e5fee8a Store ABI detection results in compiler information files 3df81b4 Move CMAKE_<LANG>_COMPILER_WORKS to compiler information files 7195aca Make platform information files specific to the CMake version
| * | | | | Make platform information files specific to the CMake versionBrad King2012-08-242-12/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | | CMake Nightly Date StampKitware Robot2012-08-301-1/+1
| | | | | |
* | | | | | CMake Nightly Date StampKitware Robot2012-08-291-1/+1
| | | | | |
* | | | | | CMake Nightly Date StampKitware Robot2012-08-281-1/+1
| |_|_|_|/ |/| | | |
* | | | | CMake Nightly Date StampKitware Robot2012-08-271-1/+1
| | | | |
* | | | | CMake Nightly Date StampKitware Robot2012-08-261-1/+1
| | | | |
* | | | | CMake Nightly Date StampKitware Robot2012-08-251-1/+1
| | | | |
* | | | | Merge topic 'ide-compiler-id'David Cole2012-08-244-16/+62
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 403ead6 Document CMAKE_<LANG>_COMPILER_(ID|VERSION) values 8be51f6 Test variables CMAKE_(C|CXX|Fortran)_COMPILER(|_ID|_VERSION) ec22a9b Cleanly enable a language in multiple subdirectories 66cb335 VS: Detect the compiler id and tool location 89595d6 VS10: Define CMAKE_VS_PLATFORM_TOOLSET variable 965a69d Xcode: Detect the compiler id and tool location 9a9e1ee CMakeDetermineCompilerId: Prepare to detect IDE compiler id b8b5c83 Re-order C/C++/Fortran compiler determination logic
| * | | | Document CMAKE_<LANG>_COMPILER_(ID|VERSION) valuesBrad King2012-08-221-5/+27
| |/ / / | | | | | | | | | | | | | | | | These values are now available almost everywhere and are tested. Document them for general use and list possible ID values.
| * | | Cleanly enable a language in multiple subdirectoriesBrad King2012-08-221-11/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | When a language is not enabled at the top level of a project but is enabled in multiple disjoint subdirectories we should re-use the CMake<lang>Compiler.cmake file from the first directory. Load the file whenever it exists and is not left from a different version of CMake.
| * | | VS10: Define CMAKE_VS_PLATFORM_TOOLSET variableBrad King2012-08-223-0/+22
| | | | | | | | | | | | | | | | | | | | When the VS 10 generator selects a non-default PlatformToolset to specify for MSBuild, report the selected name in this variable.
* | | | Merge topic 'vs-AddPlatformDefinitions-cleanup'David Cole2012-08-2421-78/+43
|\ \ \ \ | |/ / / | | | | | | | | | | | | 2c7a451 VS: Cleanup AddPlatformDefinitions() of Visual Studio generators
| * | | VS: Cleanup AddPlatformDefinitions() of Visual Studio generatorsPatrick Gansterer2012-08-2221-78/+43
| | | | | | | | | | | | | | | | | | | | Move adding of definitions into cmGlobalVisualStudioGenerator to share code and avoid duplicate architecture string literals.
* | | | Merge topic 'vs11-flag-table'David Cole2012-08-245-15/+781
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | 9b2dda5 VS11: Generate flag tables from MSBuild V110 tool files 4cb99b1 cmparseMSBuildXML: Include DisplayName in the output
| * | | | VS11: Generate flag tables from MSBuild V110 tool filesBrad King2012-08-225-4/+770
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Run cmparseMSBuildXML.py on cl.xml, lib.xml, and link.xml to generate our flag tables: python cmparseMSBuildXML.py -x ".../MSBuild/Microsoft.Cpp/v4.0/V110/1033/cl.xml" > cmVS11CLFlagTable.h python cmparseMSBuildXML.py -x ".../MSBuild/Microsoft.Cpp/v4.0/V110/1033/lib.xml" > cmVS11LibFlagTable.h python cmparseMSBuildXML.py -x ".../MSBuild/Microsoft.Cpp/v4.0/V110/1033/link.xml" > cmVS11LinkFlagTable.h Fix up the declaration names at the top of each file. Finally, teach cmVisualStudio10TargetGenerator to select the version of the table matching the version of VS.
| * | | | cmparseMSBuildXML: Include DisplayName in the outputZack Galbreath2012-08-221-11/+11
| |/ / /
* | | | Merge topic 'VS10-PrecompiledHeader-default'David Cole2012-08-241-0/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | f0ae381 VS: Disable precompiled headers unless enabled by project (#12930)
| * | | | VS: Disable precompiled headers unless enabled by project (#12930)Brad King2012-08-221-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In VS 11 the WindowsAppContainer element enabled by the VS_WINRT_EXTENSIONS property activates precompiled header support automatically if no PrecompiledHeader setting is specified. For VS 10 and 11 set PrecompiledHeader to "NotUsing" explicitly by default unless overridden by a project-specified flag. Suggested-by: Eugene Golushkov <eugene_gff@ukr.net>
* | | | | Merge topic 'VS11-WinRT-project-issue-12930'David Cole2012-08-241-1/+2
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | 4c9ae47 VS11: Rename 'Immersive' to 'WindowsAppContainer' (#12930)
| * | | | VS11: Rename 'Immersive' to 'WindowsAppContainer' (#12930)Brad King2012-08-211-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit 9e01aefd (VS: Add support for WinRT project properties, 2012-02-03) CMake generates for VS 11 projects the 'Immersive' element for the VS_WINRT_EXTENSIONS target property. That was based on the VS 11 preview version. The final version renamed the element to 'WindowsAppContainer', so generate that instead. Suggested-by: Eugene Golushkov <eugene_gff@ukr.net>
* | | | | Merge topic 'ninja-target-pdb-cleanup'David Cole2012-08-243-47/+42
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 709fa59 Ninja: remove GetTargetPDB because it is used only once 4bb4787 Ninja:split out setting of msvc TARGET_PDB 59cbc28 Ninja: prepare msvc pdb cleanup
| * | | | | Ninja: remove GetTargetPDB because it is used only oncePeter Kümmel2012-08-222-17/+11
| | | | | |
| * | | | | Ninja:split out setting of msvc TARGET_PDBPeter Kümmel2012-08-223-25/+24
| | | | | |
| * | | | | Ninja: prepare msvc pdb cleanupPeter Kümmel2012-08-222-17/+19
| | |_|_|/ | |/| | |
* | | | | Merge topic 'compile-definitions-unique'David Cole2012-08-245-91/+135
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f0a1065 Rename files from main.cpp to more meaningful names. ca7fb14 Fix the test setting COMPILE_DEFINITIONS target property 733deb6 Fix CompileDefinitions test on Visual Studio. 3dae652 Don't duplicate -D defines sent to the compiler.
| * | | | | Don't duplicate -D defines sent to the compiler.Stephen Kelly2012-08-205-91/+135
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There is no need to do so. Be consistent with include directories and ensure uniqueness. This requires changing the API of the cmLocalGenerator::AppendDefines method, and changing the generators to match. The test unfortunately can't test for uniqueness, but it at least verifies that nothing gets lost.
* | | | | | Merge topic 'pic-docs'David Cole2012-08-242-2/+5
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | c82fbe0 Fix unfortunate documentation error for PIC feature.
| * | | | | | Fix unfortunate documentation error for PIC feature.Stephen Kelly2012-08-202-2/+5
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | The wrong variable is documented, and it is not referred to in the target-specific property.
* | | | | | Merge topic 'minor-docs-fixes'David Cole2012-08-243-7/+4
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ee949d8 Remove duplicate 'of' from docs. ecc1acb Remove incorrect doc string for link type enum 805f5e5 Fix some typos in the docs. 389d423 Add missing whitespace to docs.
| * | | | | | Remove duplicate 'of' from docs.Stephen Kelly2012-08-201-1/+1
| | | | | | |
| * | | | | | Remove incorrect doc string for link type enumStephen Kelly2012-08-191-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This is actually a duplicate doc string for a method a few lines above.
| * | | | | | Fix some typos in the docs.Stephen Kelly2012-08-191-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | s/static the static/the static/ Make Visual Studio capitalized.