summaryrefslogtreecommitdiffstats
path: root/Source
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'vs-generator-platform'Brad King2014-09-154-2/+25
|\ | | | | | | | | | | | | | | | | be6a555d Tests: Test setting a generator platform in a toolchain file d506fee8 Tests: Use -A option to pass generator platform selection 11c9ddd6 ExternalProject: Use -A option to pass generator platform 29bd843e CTest: Use -A option to pass generator platform selection eb7d8156 cmake: Add -A option to specify a generator platform
| * CTest: Use -A option to pass generator platform selectionBrad King2014-09-152-2/+2
| | | | | | | | This is less verbose than defining CMAKE_GENERATOR_PLATFORM.
| * cmake: Add -A option to specify a generator platformBrad King2014-09-152-0/+23
| | | | | | | | | | | | | | | | | | | | | | | | Define the 'cmake -A' option to set CMAKE_GENERATOR_PLATFORM without having to spell out the whole variable name. We choose the name '-A' for "platform" because '-P' is already taken, and in the common use case the "platform" is actually an architecture (e.g. x64). Teach the RunCMake test infrastructure to use -A to pass the generator platform. Extend the RunCMake.GeneratorPlatform test with a case to verify that the -A option cannot be repeated.
* | Merge topic 'if-sanity'Brad King2014-09-1513-727/+1096
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 858d5a0b Fix if() checks of CMAKE_SYSTEM_NAME on Cygwin e177e7af FPHSA: Avoid if() dereferencing of quoted variable 425acc52 cmcurl: Use if(DEFINED) to simplify conditions cede5cbd libarchive: Avoid depending on if() to dereference a quoted variable 2d97178b FindGTK2: Avoid depending on if() to dereference a quoted variable 0b12815d Modules/Test*.cmake: Use if(DEFINED) to simplify conditions 188a1f23 If: Introduce policy CMP0054 - don't dereference quoted variables in if() b900c1cc If: Extract cmConditionEvaluator from if() implementation
| * | Fix if() checks of CMAKE_SYSTEM_NAME on CygwinBrad King2014-09-111-1/+1
| | | | | | | | | | | | | | | | | | The CMAKE_SYSTEM_NAME is "CYGWIN", but we also define a variable named "CYGWIN" to "1". Avoid allowing if() to expand the "CYGWIN" string as a variable.
| * | If: Introduce policy CMP0054 - don't dereference quoted variables in if()Nils Gladitz2014-09-1112-93/+379
| | |
| * | If: Extract cmConditionEvaluator from if() implementationNils Gladitz2014-09-116-720/+803
| | |
* | | CMake Nightly Date StampKitware Robot2014-09-151-1/+1
| | |
* | | CMake Nightly Date StampKitware Robot2014-09-141-1/+1
| | |
* | | CMake Nightly Date StampKitware Robot2014-09-131-1/+1
| | |
* | | CMake Nightly Date StampKitware Robot2014-09-121-1/+1
| | |
* | | CMake Nightly Date StampKitware Robot2014-09-111-1/+1
| | |
* | | Merge topic 'vs-generator-platform'Brad King2014-09-1016-59/+208
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 09c8ad99 enable_language: Initialize system-specific generator info only once 09ab207c Tests: Add generator platform support 6944997b ExternalProject: Propagate the generator platform 8d332091 CTest: Add options to set generator platform b97736a2 VS: Implement CMAKE_GENERATOR_PLATFORM for VS >= 8 0f1f1271 CMake: Add CMAKE_GENERATOR_PLATFORM option 4f7d0c42 Help: Document CMAKE_VS_PLATFORM_NAME variable 68d4280a VS: Refactor internal default platform name selection ad2a4776 cmGlobalVisualStudio10Generator: Re-order some methods 03b7b6cd cmGlobalGenerator: Call SetGeneratorToolset even for empty toolset
| * | enable_language: Initialize system-specific generator info only onceBrad King2014-09-101-20/+24
| | | | | | | | | | | | | | | | | | Call SetSystemName, SetGeneratorPlatform, and SetGeneratorToolset exactly once after reading CMakeSystem.cmake, and not again on another call to enable_language() or project().
| * | 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.
* | | Merge topic 'update-kwsys'Brad King2014-09-103-6/+72
|\ \ \ | | | | | | | | | | | | | | | | | | | | daab3b3b Merge branch 'upstream-kwsys' into update-kwsys 92b582a6 KWSys 2014-09-08 (fb77be5a)
| * | | Merge branch 'upstream-kwsys' into update-kwsysBrad King2014-09-093-6/+72
| | | |
* | | | Merge topic 'tolerate-lib-dir-symlink'Brad King2014-09-101-2/+8
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | f99cc9c3 Tolerate symlinks during RPATH ordering (#13429)
| * | | | Tolerate symlinks during RPATH ordering (#13429)Brad King2014-09-091-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On Arch Linux, /lib and /lib64 are symlinks to /usr/lib. When ordering runtime library search paths, we must not consider these to be distinct directories. Before considering conflicts between two directories, check that they do not have the same 'realpath'. Inspired-by: Myles English <mylesenglish@gmail.com>
* | | | | CMake Nightly Date StampKitware Robot2014-09-101-1/+1
|/ / / /
* | | | CMake Nightly Date StampKitware Robot2014-09-091-1/+1
|/ / /
* | | CMake Nightly Date StampKitware Robot2014-09-081-1/+1
| | |
* | | CMake Nightly Date StampKitware Robot2014-09-071-1/+1
| | |
* | | CMake Nightly Date StampKitware Robot2014-09-061-1/+1
|/ /
* | 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.