summaryrefslogtreecommitdiffstats
path: root/Source
Commit message (Collapse)AuthorAgeFilesLines
* CTest: Add options to set generator platformBrad King2014-09-054-0/+24
| | | | | | | | | | The ctest_configure command already reads the CTEST_CMAKE_GENERATOR variable to get the value for the cmake -G option. Read new variable CTEST_CMAKE_GENERATOR_PLATFORM to pass on as CMAKE_GENERATOR_PLATFORM. The "ctest --build-and-test" mode already has "--build-generator" to specify the -G option to CMake. Add a "--build-generator-platform" option to specify a value to pass on as CMAKE_GENERATOR_PLATFORM.
* VS: Implement CMAKE_GENERATOR_PLATFORM for VS >= 8Brad King2014-09-056-4/+48
| | | | | | | | | For VS generator names that do not specify the platform name, read CMAKE_GENERATOR_PLATFORM to get it. Extend the RunCMake.GeneratorPlatform test with a case covering use of the x64 platform when the test generator is a Visual Studio generator whose name does not specify a platform.
* CMake: Add CMAKE_GENERATOR_PLATFORM optionBrad King2014-09-055-0/+71
| | | | | | | | | | | 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_PLATFORM and associated variable documentation to hold the value persistently. Add a RunCMake.GeneratorPlatform test to cover basic use cases for the option. Verify that CMAKE_GENERATOR_PLATFORM is empty by default, and that it is rejected when the generator does not support a user setting.
* VS: Refactor internal default platform name selectionBrad King2014-09-053-7/+13
| | | | | | Rename the 'PlatformName' member to 'DefaultPlatformName' and make sure it is only read through a 'GetPlatformName()' call. This will allow non-default names to be chosen later.
* cmGlobalVisualStudio10Generator: Re-order some methodsBrad King2014-09-052-14/+14
| | | | | Order SetSystemName and SetGeneratorToolset method declarations and definitions as they are called.
* cmGlobalGenerator: Call SetGeneratorToolset even for empty toolsetBrad King2014-09-054-26/+26
| | | | | | Move handling of an empty toolset name into the implementation of the method. This simplifies the VS 10 implementation of default toolset selection because it has one code path that is always called.
* CMake Nightly Date StampKitware Robot2014-09-051-1/+1
|
* Merge topic 'xcode-duplicate-file-refs'Brad King2014-09-041-6/+4
|\ | | | | | | | | | | | | d73f8828 Merge branch 'backport-xcode-duplicate-file-refs' into xcode-duplicate-file-refs cf92fe2d Xcode: Generate per-target file references (#15111) e7114226 Xcode: Generate per-target file references (#15111)
| * Xcode: Generate per-target file references (#15111)Brad King2014-09-031-6/+4
| | | | | | | | | | | | | | Xcode requires a separate PBXFileReference for each target source group that references a source file. Xcode 6 now diagnoses re-use of the same PBXFileReference from multiple source groups. Add the referencing target name to our internal map key so we use a per-target reference.
* | Merge topic 'xcode-assetcatalog-folder-type'Brad King2014-09-041-8/+8
|\ \ | | | | | | | | | | | | | | | 8eacc339 Xcode: Reference '.xcassets' folders as assetcatalog (#15125) 02aa5965 Xcode: Refactor internal file type extension extraction
| * | Xcode: Reference '.xcassets' folders as assetcatalog (#15125)Brad King2014-09-031-1/+1
| | |
| * | Xcode: Refactor internal file type extension extractionBrad King2014-09-031-7/+7
| |/ | | | | | | Move it earlier so it can be used for directories too.
* | CMake Nightly Date StampKitware Robot2014-09-041-1/+1
|/
* CMake Nightly Date StampKitware Robot2014-09-031-1/+1
|
* Merge topic 'ctest-help-fix'Brad King2014-09-021-2/+2
|\ | | | | | | | | 6767660f CTest: Add missing space in command line help.
| * CTest: Add missing space in command line help.Nils Gladitz2014-09-011-2/+2
| |
* | Merge topic 'string-uuid'Brad King2014-09-025-0/+387
|\ \ | | | | | | | | | | | | | | | 87e476e8 Help: Add notes for topic 'string-uuid' 328e8694 StringUuid: Implement new string(UUID) sub-command.
| * | StringUuid: Implement new string(UUID) sub-command.Nils Gladitz2014-08-285-0/+387
| | |
* | | Merge topic 'vs-windows-apps'Brad King2014-09-026-11/+704
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 39fefde2 VS: Add test case for Windows Phone and Windows Store 89da8465 MSVC: Define 'WIN32' for Windows Store and Windows Phone ed7f085f Help: Add notes for topic 'vs-windows-apps' dd11ae8f VS: Do not compile C sources as WinRT (#15100) b8e40538 VS: Mark Windows Phone and Store targets as App Containers 0432f062 VS: Always ignore ole32 on Windows Phone 8.0 e6ff2f8b VS: Generate Windows Metadata for WinRT components ee48f4c7 VS: Generate Windows Phone and Windows Store projects as Unicode cb1aceed VS: Add VS_WINRT_COMPONENT property to enable CompileAsWinRT 401269e4 VS: Handle .pfx files explicitly in generator 23782171 VS: Handle AppxManifest sources explicitly in generator bc373c6d VS: Set Window Phone/Store app type in CMake-generated targets d89b2889 VS: Mark CMake-generated targets as Utility in .vcxproj files 03ad8f28 CMakeDetermineCompilerABI: Link with standard libraries on MSVC
| * | | VS: Do not compile C sources as WinRT (#15100)Brad King2014-09-022-1/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The MSVC /ZW flag is valid only for C++ sources. Whenever we enable CompileAsWinRT for the whole target, disable it for all C sources. Update the documentation of VS_WINRT_COMPONENT to drop the statement about undefined behavior for non-C++ sources, because it is now defined as expected.
| * | | VS: Mark Windows Phone and Store targets as App ContainersGilles Khouzam2014-09-022-3/+552
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add AppContainerApplication to non-UTILITY targets * Generate app manifest and related files if project does not provide them. Place them in a per-target directory to avoid clashes. * Mark WinRT components with WinMDAssembly * Import Windows Phone 8.0 targets in .vcxproj files when necessary, and reference platform.winmd. Inspired-by: Paul Annetts <paul@lightunobscured.com>
| * | | VS: Always ignore ole32 on Windows Phone 8.0Gilles Khouzam2014-08-211-0/+7
| | | | | | | | | | | | | | | | Inspired-by: Paul Annetts <paul@lightunobscured.com>
| * | | VS: Generate Windows Metadata for WinRT componentsGilles Khouzam2014-08-211-0/+27
| | | | | | | | | | | | | | | | Inspired-by: Paul Annetts <paul@lightunobscured.com>
| * | | VS: Generate Windows Phone and Windows Store projects as UnicodeGilles Khouzam2014-08-211-0/+2
| | | |
| * | | VS: Add VS_WINRT_COMPONENT property to enable CompileAsWinRTGilles Khouzam2014-08-213-1/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Deprecate VS_WINRT_EXTENSIONS and document VS_WINRT_COMPONENT as for VS generators only. Also define _WINRT_DLL in SHARED libraries in order to get a .lib produced. Inspired-by: Paul Annetts <paul@lightunobscured.com>
| * | | VS: Handle .pfx files explicitly in generatorGilles Khouzam2014-08-214-0/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Teach cmGeneratorTarget to classify .pfx files as package certificate key files. Teach cmVisualStudio10TargetGenerator to write them as PackageCertificateKeyFile in .vcxproj files. Inspired-by: Minmin Gong <minmin.gong@gmail.com>
| * | | VS: Handle AppxManifest sources explicitly in generatorGilles Khouzam2014-08-213-5/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Teach cmGeneratorTarget to extract .appxmanifest sources separately. Teach cmVisualStudio10TargetGenerator to write them with the AppxManifest tool in .vcxproj files. This will allow us to detect whether the project provides an application manfiest explicitly.
| * | | VS: Set Window Phone/Store app type in CMake-generated targetsBrad King2014-08-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Generate the ApplicationType and ApplicationTypeRevision elements in .vcxproj files for CMake-generated targets like 'INSTALL' and 'RUN_TESTS'. This was accidentally left out of commit 709cebde (VS: Generate WindowsPhone and WindowsStore application types, 2014-07-31).
| * | | VS: Mark CMake-generated targets as Utility in .vcxproj filesBrad King2014-08-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Targets like 'INSTALL' and 'RUN_TESTS' are Utility targets. Fix the VS >= 10 generator to set this correctly. We already do so for VS < 10.
* | | | CMake Nightly Date StampKitware Robot2014-09-021-1/+1
| |_|/ |/| |
* | | CMake Nightly Date StampKitware Robot2014-09-011-1/+1
| | |
* | | CMake Nightly Date StampKitware Robot2014-08-311-1/+1
| | |
* | | CMake Nightly Date StampKitware Robot2014-08-301-1/+1
| | |
* | | CMake Nightly Date StampKitware Robot2014-08-291-1/+1
| | |
* | | CMake Nightly Date StampKitware Robot2014-08-281-1/+1
| | |
* | | CMake Nightly Date StampKitware Robot2014-08-271-1/+1
| | |
* | | CMake Nightly Date StampKitware Robot2014-08-261-1/+1
| |/ |/|
* | CMake Nightly Date StampKitware Robot2014-08-251-1/+1
| |
* | CMake Nightly Date StampKitware Robot2014-08-241-1/+1
| |
* | CMake Nightly Date StampKitware Robot2014-08-231-1/+1
| |
* | Merge topic 'vs-masm'Brad King2014-08-2214-19/+553
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cbd1d42b Help: Add notes for topic 'vs-masm' 0f8522a6 VS: Add MASM support to VS 8 and 9 (#8170, #14984) a43f4400 VS: Move internal MasmEnabled member up to VS 7 generator df3b007d VS: Add test for MASM support e8727449 VS: Populate MASM tool build settings in .vcxproj files 0271a5f9 VS: Manually fix MASM flag table entries 1d662e48 VS: Generate MASM flag tables from MSBuild tool files 4f6940df VS: Fix ASM_MASM support in VS >= 10 d7866c52 ASM_MASM: Fix selection of ml64 0374abdb ASM_MASM: Add preprocessor definitions to compile lines 5b0a46e1 ASM_MASM: Do not require compiler to be a full path 802dbe52 cmLocalVisualStudio7Generator: Rename local 'lang' var
| * | VS: Add MASM support to VS 8 and 9 (#8170, #14984)Brad King2014-08-201-0/+51
| | |
| * | VS: Move internal MasmEnabled member up to VS 7 generatorBrad King2014-08-205-14/+13
| | | | | | | | | | | | | | | | | | | | | | | | Move the member from cmGlobalVisualStudio10Generator to cmGlobalVisualStudio7Generator to make it useful for earlier versions of VS. Set the member to true only starting with cmGlobalVisualStudio8Generator since we will not implement MASM support for versions less than VS 8.
| * | VS: Populate MASM tool build settings in .vcxproj filesBrad King2014-08-133-0/+99
| | |
| * | VS: Manually fix MASM flag table entriesBrad King2014-08-134-20/+20
| | | | | | | | | | | | Drop '"[value]"' placeholders.
| * | VS: Generate MASM flag tables from MSBuild tool filesBrad King2014-08-134-0/+384
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Run cmparseMSBuildXML.py on masm.xml to generate our flag tables: python cmparseMSBuildXML.py -x ".../MSBuild/Microsoft.Cpp/v4.0/BuildCustomizations/masm.xml" > cmVS10MASMFlagTable.h python cmparseMSBuildXML.py -x ".../MSBuild/Microsoft.Cpp/v4.0/V110/BuildCustomizations/masm.xml" > cmVS11MASMFlagTable.h python cmparseMSBuildXML.py -x ".../MSBuild/Microsoft.Cpp/v4.0/V120/BuildCustomizations/masm.xml" > cmVS12MASMFlagTable.h python cmparseMSBuildXML.py -x ".../MSBuild/Microsoft.Cpp/v4.0/V140/BuildCustomizations/masm.xml" > cmVS14MASMFlagTable.h Fix up the declaration names at the top of each file.
| * | VS: Fix ASM_MASM support in VS >= 10Brad King2014-08-131-1/+1
| | | | | | | | | | | | | | | Fix a typo introduced by commit ce511435 (stringapi: Use strings for the languages, 2014-02-03) to check the language name correctly.
| * | ASM_MASM: Do not require compiler to be a full pathBrad King2014-08-131-1/+2
| | | | | | | | | | | | | | | The compiler detection modules for this language do not yet know how to find the full path to 'ml' or 'ml64', so do not require it.
| * | cmLocalVisualStudio7Generator: Rename local 'lang' varBrad King2014-08-131-3/+3
| | | | | | | | | | | | | | | In the WriteGroup method, rename the 'lang' var to 'ppLang' since it is specifically for the preprocessor definitions language selection.
* | | CMake Nightly Date StampKitware Robot2014-08-221-1/+1
| | |