summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Autogen: Add AUTOGEN_SOURCE_GROUP supportSebastian Holtermann2017-03-161-6/+67
| | | | Closes: #16501
* Autogen: Add generator type enumSebastian Holtermann2017-03-161-0/+7
|
* CMake Nightly Date StampKitware Robot2017-03-161-1/+1
|
* CMake Nightly Date StampKitware Robot2017-03-151-1/+1
|
* CMake Nightly Date StampKitware Robot2017-03-141-1/+1
|
* Merge branch 'release'Brad King2017-03-130-0/+0
|\
| * Merge branch 'doc-toolset-host-arch-typo' into releaseBrad King2017-03-131-1/+1
| |\
* | \ Merge topic 'doc-vs-toolset-options'Brad King2017-03-136-30/+65
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3df2506f Help: Document VS generator toolset specification syntax 60546b48 Help: Cross-reference generator toolset variables 35c5cddc Help: Cross-reference generator platform variables 7df38939 Help: Move generator toolset support details to variable docs c750b282 Help: Move generator platform support details to variable docs Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !580
| * | | Help: Document VS generator toolset specification syntaxBrad King2017-03-132-7/+25
| | | |
| * | | Help: Cross-reference generator toolset variablesBrad King2017-03-132-0/+8
| | | |
| * | | Help: Cross-reference generator platform variablesBrad King2017-03-132-0/+7
| | | |
| * | | Help: Move generator toolset support details to variable docsBrad King2017-03-132-16/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Move the details about support for generator toolset specification to the `CMAKE_GENERATOR_TOOLSET` variable documentation. This is a more suitable place because it is shared by all means to set this variable, not just the `cmake -T` option.
| * | | Help: Move generator platform support details to variable docsBrad King2017-03-132-8/+9
|/ / / | | | | | | | | | | | | | | | | | | Move the details about support for generator platform specification to the `CMAKE_GENERATOR_PLATFORM` variable documentation. This is a more suitable place because it is shared by all means to set this variable, not just the `cmake -A` option.
* | | Merge topic 'doc-toolset-host-arch-typo'Brad King2017-03-131-1/+1
|\ \ \ | | |/ | |/| | | | | | | | | | | | | 81b24547 Help: Fix typo in CMAKE_VS_PLATFORM_TOOLSET_HOST_ARCHITECTURE Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !579
| * | Help: Fix typo in CMAKE_VS_PLATFORM_TOOLSET_HOST_ARCHITECTUREBrad King2017-03-131-1/+1
| | |
* | | Merge topic 'cuda-vs'Brad King2017-03-131-0/+5
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 2a1f3dff Help: Add notes for topic 'cuda-vs' Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !578
| * | | Help: Add notes for topic 'cuda-vs'Brad King2017-03-131-0/+5
| | | |
* | | | Merge branch 'release'Brad King2017-03-130-0/+0
|\ \ \ \ | | |_|/ | |/| |
| * | | Merge branch 'FindGit-avoid-vs-2017-git' into releaseBrad King2017-03-101-1/+15
| |\ \ \
| * \ \ \ Merge branch 'doc-vs15-MSVC_VERSION' into releaseBrad King2017-03-081-1/+2
| |\ \ \ \
* | \ \ \ \ Merge topic 'x32-abi-tests'Brad King2017-03-131-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7a2de256 Tests: Fix CMakeOnly.find_library test logic for libx32 case Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !573
| * | | | | | Tests: Fix CMakeOnly.find_library test logic for libx32 caseChristian Schmidbauer2017-03-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Teach `test_find_library_subst` how to convert `libx32` to `lib` so that the test case actually covers what we intend it to.
* | | | | | | Merge topic 'BundleUtilities-elf-rpath'Brad King2017-03-137-1/+88
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 10fcef02 BundleUtilities: Fix bundle verification on Unix by considering rpaths. ac0786cb BundleUtilities: Teach `get_item_rpaths` to parse ELF binaries a52faa1f file: Add READ_ELF command to parse ELF binaries Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !551
| * | | | | | | BundleUtilities: Fix bundle verification on Unix by considering rpaths.Florian Apolloner2017-03-101-1/+2
| | | | | | | |
| * | | | | | | BundleUtilities: Teach `get_item_rpaths` to parse ELF binariesFlorian Apolloner2017-03-101-0/+10
| | | | | | | |
| * | | | | | | file: Add READ_ELF command to parse ELF binariesFlorian Apolloner2017-03-106-0/+76
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Leave it undocumented for now because we intend to use it internally and it cannot be made available everywhere.
* | | | | | | | Merge topic 'xcode-test-schema-generation'Brad King2017-03-137-6/+26
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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: Add test for schema generationGregor Jasny2017-03-122-0/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes: #15441
| * | | | | | | | Xcode: Control schema generation via variableGregor Jasny2017-03-125-6/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Issue: #15441
* | | | | | | | | Merge topic 'cuda-vs'Brad King2017-03-1320-34/+775
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | | | CUDA: Work around VS limitation in CudaOnly.WithDefs testBrad King2017-03-102-2/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CUDA 8.0 MSBuild rules do not pass `-x cu` to nvcc and so cannot support a custom file extension. Fix our test for this to use a `.cu` extension instead.
| * | | | | | | | 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 support for determining CUDA compiler idBrad King2017-03-102-21/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Teach `CMakeDetermineCompilerId` how to generate a vcxproj file using the `CMAKE_VS_PLATFORM_TOOLSET_CUDA`.
| * | | | | | | | 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: Add more placeholders to compiler id detection project file templateBrad King2017-03-102-0/+12
| | | | | | | | |
| * | | | | | | | VS: Refactor compiler id detection project file templateBrad King2017-03-102-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make the `ClCompile` element name and `PostBuildEvent/Command` value configurable. Move the current content into default values for the corresponding variables.
| * | | | | | | | VS: Select highest available CUDA toolset by defaultBrad King2017-03-102-2/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-109-2/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.