summaryrefslogtreecommitdiffstats
path: root/Source
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'xcode-test-schema-generation'Brad King2017-03-131-2/+1
|\ | | | | | | | | | | | | | | 3fd9f4ab Xcode: Add test for schema generation cf13e495 Xcode: Control schema generation via variable Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !577
| * Xcode: Control schema generation via variableGregor Jasny2017-03-121-2/+1
| | | | | | | | Issue: #15441
* | Merge topic 'cuda-vs'Brad King2017-03-138-9/+678
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 65481a60 CUDA: Work around VS limitation in CudaOnly.WithDefs test 8cae24a1 VS: Add more CUDA flag table entries 6ca4f222 VS: Add support for the CUDA_SEPARABLE_COMPILATION property 94255511 VS: Select CUDA code generation architectures 253594d0 VS: Select the CUDA runtime library 4def02a3 VS: Place CUDA host compiler options in proper project file fields 29f07b08 VS: Do not pass CUDA compile options to C compiler b966f489 VS: Do not use absolute paths to CUDA sources ... Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !566
| * | VS: Add more CUDA flag table entriesBrad King2017-03-101-0/+11
| | |
| * | VS: Add support for the CUDA_SEPARABLE_COMPILATION propertyBrad King2017-03-101-0/+4
| | |
| * | VS: Select CUDA code generation architecturesBrad King2017-03-104-0/+77
| | | | | | | | | | | | | | | Parse the `-gencode=`, `-arch`, and `-code` flags and generate a `CodeGeneration` field in the project file.
| * | VS: Select the CUDA runtime libraryBrad King2017-03-104-2/+70
| | | | | | | | | | | | | | | | | | Parse the `-cudart=` option and add a corresponding `CudaRuntime` field to the generated project file. Also add a matching `.lib` to the list of libraries linked.
| * | VS: Place CUDA host compiler options in proper project file fieldsBrad King2017-03-103-2/+54
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The CUDA Toolkit's VS integration provides abstractions for host compiler options for `nvcc` to pass through `-Xcompiler` to the host MSVC. Populate our secondary flag table and use it to remove flags from the `AdditionalCompilerOptions` in favor of their abstractions. Unfortunately a bug in the CUDA 8.0 VS integration prevents us from passing anything in `AdditionalCompilerOptions` reliably. After taking out the flags that have dedicated abstractions, drop the rest.
| * | VS: Do not pass CUDA compile options to C compilerBrad King2017-03-101-2/+4
| | |
| * | VS: Do not use absolute paths to CUDA sourcesBrad King2017-03-101-2/+4
| | | | | | | | | | | | | | | | | | The CUDA Toolkit's VS integration does not properly compute the intermediate files directory location when the path to the source file is absolute.
| * | VS: Add basic infrastructure for CUDA generationBrad King2017-03-104-0/+112
| | | | | | | | | | | | Generate the `CudaCompile` elements in `.vcxproj` files.
| * | VS: Add placeholder CUDA flag tablesBrad King2017-03-104-0/+21
| | | | | | | | | | | | | | | | | | | | | The CUDA Toolkit's VS integration defines abstractions for both options to `nvcc` and options to pass through `-Xcompiler` to the host MSVC. We need a separate flag table to parse each set of flags into the corresponding abstractions. Add empty placeholders for these tables.
| * | VS: Record in global generator whether CUDA is enabledBrad King2017-03-102-0/+8
| | |
| * | VS: Add method to take a value out of the option parser flag mapBrad King2017-03-102-0/+14
| | | | | | | | | | | | Remove a flag from the map and return its value.
| * | VS: Add method to re-parse specific option parser fieldsBrad King2017-03-102-1/+23
| | | | | | | | | | | | | | | | | | This will allow a client to parse flags, replace the flag tables, and then re-parse a field in which flags for a secondary tool were collected.
| * | VS: Add method to clear flag tables of option parserBrad King2017-03-102-0/+10
| | |
| * | VS: Select highest available CUDA toolset by defaultBrad King2017-03-101-0/+27
| | | | | | | | | | | | | | | If `CMAKE_GENERATOR_TOOLSET` does not have a `cuda=...` field then find available CUDA toolsets and choose the highest version.
| * | VS: Provide an option to specify CUDA toolset versionBrad King2017-03-102-2/+26
| | | | | | | | | | | | | | | | | | | | | | | | The NVIDIA CUDA Toolkit provides MSBuild toolset files for integration with Visual Studio. Multiple versions may be installed so we need a way to tell our VS generators which CUDA toolset to use. Extend the `CMAKE_GENERATOR_TOOLSET` specification to provide a `cuda=...` field specifying the version number.
| * | VS: Find the MSBuild value for VCTargetsPathBrad King2017-03-102-0/+215
| | | | | | | | | | | | | | | | | | Run MSBuild on a simple `.vcxproj` file to extract the location of the toolset definitions. This will later be useful for looking at available BuildCustomizations.
* | | Merge topic 'refactor-module-def'Brad King2017-03-1314-181/+165
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f36eaf6a Refactor WINDOWS_EXPORT_ALL_SYMBOLS implementation 25d261ef Refactor module definition file selection 1e0a9ac4 Refactor module definition source enumeration Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !570
| * | | Refactor WINDOWS_EXPORT_ALL_SYMBOLS implementationBrad King2017-03-0911-137/+90
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Use `cmGeneratorTarget::ModuleDefinitionInfo` to combine the implementation of `WINDOWS_EXPORT_ALL_SYMBOLS` with that of using a `.def` file as a source. Only one of these could be used within a single target before anyway.
| * | | Refactor module definition file selectionBrad King2017-03-099-39/+64
| | | | | | | | | | | | | | | | | | | | | | | | Create a `ModuleDefinitionInfo` structure for each configuration of a target to hold corresponding information about the selected module definition file (`.def` source).
| * | | Refactor module definition source enumerationBrad King2017-03-093-9/+15
| |/ / | | | | | | | | | Add a `cmGeneratorTarget::GetModuleDefinitionSources` method.
* | | Merge topic 'update-kwsys'Brad King2017-03-134-3/+22
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 83be64d9 Merge branch 'upstream-KWSys' into update-kwsys 8ba8b553 KWSys 2017-03-07 (5da8cfe0) Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !576
| * | | Merge branch 'upstream-KWSys' into update-kwsysBrad King2017-03-104-3/+22
| | | | | | | | | | | | | | | | | | | | * upstream-KWSys: KWSys 2017-03-07 (5da8cfe0)
* | | | CMake Nightly Date StampKitware Robot2017-03-131-1/+1
| |_|/ |/| |
* | | CMake Nightly Date StampKitware Robot2017-03-121-1/+1
| | |
* | | CMake Nightly Date StampKitware Robot2017-03-111-1/+1
|/ /
* | CMake Nightly Date StampKitware Robot2017-03-101-1/+1
| |
* | Merge topic 'master'Brad King2017-03-096-2/+42
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | d9bdcf34 Tests: Add x32 tests to test suite 5b6d354f Help: Add notes for topic 'x32-abi' bed9c73d Modules: Add x32-abi support to hard-coded paths 462cf254 Add support for x32-abi Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !532
| * | Add support for x32-abiSteven Newbury2017-03-076-2/+42
| | | | | | | | | | | | | | | | | | | | | | | | Detect x32-abi through CMakeCompilerABI infrastruture and use this information at runtime to determine the correct library paths with `FIND_LIBRARY_USE_LIBX32_PATHS`. Fixes: #15994
* | | CMake Nightly Date StampKitware Robot2017-03-091-1/+1
| |/ |/|
* | Merge topic 'fix_csharp_custom_targets'Brad King2017-03-081-0/+4
|\ \ | | | | | | | | | | | | | | | | | | bd8b5401 VS: Do not treat custom targets as CSharp targets Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !557
| * | VS: Do not treat custom targets as CSharp targetsMichael Stürmer2017-03-071-0/+4
| | | | | | | | | | | | Fixes: #16697
* | | Merge topic 'target-type-ordering-comment'Brad King2017-03-081-0/+3
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 322425fa cmStateTypes: document that the ordering of targets is important Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !560
| * | | cmStateTypes: document that the ordering of targets is importantBen Boeckel2017-03-071-0/+3
| | | | | | | | | | | | | | | | | | | | The ordering is assumed in many places throughout the code and modification of the enumeration should be done carefully.
* | | | Merge topic 'cmake-server-aix'Brad King2017-03-081-0/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f5c4dada cmFileMonitor.h: Include cmConfigure.h first Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !562
| * | | | cmFileMonitor.h: Include cmConfigure.h firstBrad King2017-03-071-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | We need this to make Large File Support definitions consistent with other translation units.
* | | | | CMake Nightly Date StampKitware Robot2017-03-081-1/+1
| |/ / / |/| | |
* | | | Merge topic 'revert-CTestTestfile-removal'Brad King2017-03-071-7/+4
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 485685fd Revert "Remove CTestTestfile.cmake when BUILD_TESTING is OFF" Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !553
| * | | | Revert "Remove CTestTestfile.cmake when BUILD_TESTING is OFF"Brad King2017-03-061-7/+4
| | |/ / | |/| | | | | | | | | | | | | | | | | | This reverts commit v3.8.0-rc1~305^2 (Remove CTestTestfile.cmake when BUILD_TESTING is OFF, 2016-11-14). It breaks projects that never enable testing but create their own `CTestTestfile.cmake` manually instead.
| * | | CMake 3.8.0-rc2v3.8.0-rc2Brad King2017-03-031-1/+1
| | | |
| * | | Merge branch 'implicit-dir-symlinks' into releaseBrad King2017-03-022-7/+17
| |\ \ \
| * \ \ \ Merge branch 'csproj_add_free_source_tags' into releaseBrad King2017-03-022-47/+47
| |\ \ \ \
| * \ \ \ \ Merge branch 'find-libarch-not-symlink' into releaseBrad King2017-02-281-16/+48
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'object-library-compile-pdb' into releaseBrad King2017-02-241-1/+1
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'ninja-no-full-path' into releaseBrad King2017-02-241-4/+3
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'vcxproj-indentation' into releaseBrad King2017-02-231-0/+1
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'clang-format-attrs' into releaseBrad King2017-02-222-10/+22
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'vs2017-fallback-sdk' into releaseBrad King2017-02-212-0/+38
| |\ \ \ \ \ \ \ \ \ \
generated by cgit v0.12 at 2025-01-06 21:48:59 (GMT)