summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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.
* Merge branch 'release'Brad King2017-03-080-0/+0
|\
| * Merge branch 'fix_csharp_custom_targets' into releaseBrad King2017-03-071-0/+4
| |\
* | \ Merge topic 'fix-static-assert'Brad King2017-03-083-4/+19
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | e2f25d3e WriteCompilerDetectionHeader: fix STATIC_ASSERT Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !555
| * | | WriteCompilerDetectionHeader: fix STATIC_ASSERTDaniel Pfeifer2017-03-063-4/+19
| | | | | | | | | | | | | | | | fixes #16185
* | | | 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.
* | | | | | Merge topic 'cuda-test-spelling'Brad King2017-03-081-8/+8
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 613b3e49 CUDA: Fix spelling of CudaOnly.SeparateCompilation test targets Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !563
| * | | | | | CUDA: Fix spelling of CudaOnly.SeparateCompilation test targetsBrad King2017-03-071-8/+8
| | | | | | |
* | | | | | | CMake Nightly Date StampKitware Robot2017-03-081-1/+1
|/ / / / / /
* | | | | | Merge topic 'doc-dev-testing'Brad King2017-03-073-10/+58
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2927e437 Help/dev: Document the CMake Testing Process b55e19dd Help/dev: Revise README to have a bullet list of available documents Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Ben Boeckel <ben.boeckel@kitware.com> Merge-request: !561
| * | | | | Help/dev: Document the CMake Testing ProcessBrad King2017-03-073-8/+54
| | | | | |
| * | | | | Help/dev: Revise README to have a bullet list of available documentsBrad King2017-03-071-2/+4
| | |_|/ / | |/| | |
* | | | | Merge branch 'release'Brad King2017-03-070-0/+0
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | Merge branch 'revert-CTestTestfile-removal' into releaseBrad King2017-03-061-7/+4
| |\ \ \ \
| * \ \ \ \ Merge branch 'FindVulkan-fix-win-32' into releaseBrad King2017-03-061-0/+1
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'FindHDF5-fix-definitions' into releaseBrad King2017-03-061-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.
* | | | | | Merge topic 'working-directory-fixes'Brad King2017-03-0720-154/+138
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | aba92ffd cmWorkingDirectory: use the new class 047a5e4d cmWorkingDirectory: add class for changing the workdir 89891bcb cmCTest, cmCTestCoverageHandler: remove cwd dance c3304fa5 OSXScriptLauncher: remove unused variable Acked-by: Kitware Robot <kwrobot@kitware.com> Reviewed-by: Brad King <brad.king@kitware.com> Merge-request: !540
| * | | | | | cmWorkingDirectory: use the new classBen Boeckel2017-03-0614-146/+86
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These functions just need to change the directory for a block of code and then go back to the caller's expected location. Use cmWorkingDirectory to ensure that all return paths are handled.
| * | | | | | cmWorkingDirectory: add class for changing the workdirBen Boeckel2017-03-064-0/+52
| | | | | | |
| * | | | | | cmCTest, cmCTestCoverageHandler: remove cwd danceBen Boeckel2017-03-062-7/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The working directory changes here didn't really accomplish anything.
| * | | | | | OSXScriptLauncher: remove unused variableBen Boeckel2017-03-061-1/+0
| | | | | | |
* | | | | | | Merge topic 'cpack_nsis_sign_uninstaller'Brad King2017-03-073-1/+53
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 09475c29 CPack/NSIS: Sign the uninstaller Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !512
| * | | | | | | CPack/NSIS: Sign the uninstallerRoman Wüger2017-03-013-1/+53
| | | | | | | |
* | | | | | | | Merge topic 'autogen_common'Brad King2017-03-0732-548/+920
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ef3c319b Autogen: Test: Add mocDepends test 7f9baf57 Autogen: Test: Add generated qrc file to rccDepends test 81656b92 Autogen: Test: Add generated file to moc rerun test d9a7ef80 Autogen: Test: Add timestamp comparison to moc rerun test 89780663 Autogen: Test: Rename automoc_rerun test to mocRerun 9cad44dc Autogen: Test: Rename autorcc_depends test to rccDepends 60274e1d Autogen: Add RunCommand method with built in logging 8f2ad9c4 Autogen: Error return when a scan file is not readable ... Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !543
| * | | | | | | | Autogen: Test: Add mocDepends testSebastian Holtermann2017-03-069-0/+119
| | | | | | | | |
| * | | | | | | | Autogen: Test: Add generated qrc file to rccDepends testSebastian Holtermann2017-03-066-9/+39
| | | | | | | | |
| * | | | | | | | Autogen: Test: Add generated file to moc rerun testSebastian Holtermann2017-03-065-18/+37
| | | | | | | | |
generated by cgit v0.12 at 2025-02-05 14:27:13 (GMT)