reactos/CMake
1
0
Fork 0
mirror of https://github.com/reactos/CMake.git synced 2024-11-28 05:50:42 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

VS: Add placeholder CUDA flag tables

Browse Source 
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.
This commit is contained in:
Brad King 2017-03-07 15:47:50 -05:00
parent 13433b1357
commit 041ebda25b
4 changed files with 21 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Source/cmGlobalVisualStudio10Generator.cxx
View File

@ -10,6 +10,8 @@
#include "cmSourceFile.h" #include "cmSourceFile.h"
#include "cmVS10CLFlagTable.h" #include "cmVS10CLFlagTable.h"
#include "cmVS10CSharpFlagTable.h" #include "cmVS10CSharpFlagTable.h"
#include "cmVS10CudaFlagTable.h"
#include "cmVS10CudaHostFlagTable.h"
#include "cmVS10LibFlagTable.h" #include "cmVS10LibFlagTable.h"
#include "cmVS10LinkFlagTable.h" #include "cmVS10LinkFlagTable.h"
#include "cmVS10MASMFlagTable.h" #include "cmVS10MASMFlagTable.h"
@ -122,6 +124,8 @@ cmGlobalVisualStudio10Generator::cmGlobalVisualStudio10Generator(
this->DefaultCSharpFlagTable = cmVS10CSharpFlagTable; this->DefaultCSharpFlagTable = cmVS10CSharpFlagTable;
this->DefaultLibFlagTable = cmVS10LibFlagTable; this->DefaultLibFlagTable = cmVS10LibFlagTable;
this->DefaultLinkFlagTable = cmVS10LinkFlagTable; this->DefaultLinkFlagTable = cmVS10LinkFlagTable;
this->DefaultCudaFlagTable = cmVS10CudaFlagTable;
this->DefaultCudaHostFlagTable = cmVS10CudaHostFlagTable;
this->DefaultMasmFlagTable = cmVS10MASMFlagTable; this->DefaultMasmFlagTable = cmVS10MASMFlagTable;
this->DefaultNasmFlagTable = cmVS10NASMFlagTable; this->DefaultNasmFlagTable = cmVS10NASMFlagTable;
this->DefaultRcFlagTable = cmVS10RCFlagTable; this->DefaultRcFlagTable = cmVS10RCFlagTable;
@ -983,6 +987,17 @@ cmIDEFlagTable const* cmGlobalVisualStudio10Generator::GetLinkFlagTable() const
return (table != CM_NULLPTR) ? table : this->DefaultLinkFlagTable; return (table != CM_NULLPTR) ? table : this->DefaultLinkFlagTable;
} }
cmIDEFlagTable const* cmGlobalVisualStudio10Generator::GetCudaFlagTable() const
{
return this->DefaultCudaFlagTable;
}
cmIDEFlagTable const* cmGlobalVisualStudio10Generator::GetCudaHostFlagTable()
const
{
return this->DefaultCudaHostFlagTable;
}
cmIDEFlagTable const* cmGlobalVisualStudio10Generator::GetMasmFlagTable() const cmIDEFlagTable const* cmGlobalVisualStudio10Generator::GetMasmFlagTable() const
{ {
cmIDEFlagTable const* table = this->ToolsetOptions.GetMasmFlagTable( cmIDEFlagTable const* table = this->ToolsetOptions.GetMasmFlagTable(

4
Source/cmGlobalVisualStudio10Generator.h
View File

@ -100,6 +100,8 @@ public:
cmIDEFlagTable const* GetRcFlagTable() const; cmIDEFlagTable const* GetRcFlagTable() const;
cmIDEFlagTable const* GetLibFlagTable() const; cmIDEFlagTable const* GetLibFlagTable() const;
cmIDEFlagTable const* GetLinkFlagTable() const; cmIDEFlagTable const* GetLinkFlagTable() const;
cmIDEFlagTable const* GetCudaFlagTable() const;
cmIDEFlagTable const* GetCudaHostFlagTable() const;
cmIDEFlagTable const* GetMasmFlagTable() const; cmIDEFlagTable const* GetMasmFlagTable() const;
cmIDEFlagTable const* GetNasmFlagTable() const; cmIDEFlagTable const* GetNasmFlagTable() const;
@ -134,6 +136,8 @@ protected:
cmIDEFlagTable const* DefaultCSharpFlagTable; cmIDEFlagTable const* DefaultCSharpFlagTable;
cmIDEFlagTable const* DefaultLibFlagTable; cmIDEFlagTable const* DefaultLibFlagTable;
cmIDEFlagTable const* DefaultLinkFlagTable; cmIDEFlagTable const* DefaultLinkFlagTable;
cmIDEFlagTable const* DefaultCudaFlagTable;
cmIDEFlagTable const* DefaultCudaHostFlagTable;
cmIDEFlagTable const* DefaultMasmFlagTable; cmIDEFlagTable const* DefaultMasmFlagTable;
cmIDEFlagTable const* DefaultNasmFlagTable; cmIDEFlagTable const* DefaultNasmFlagTable;
cmIDEFlagTable const* DefaultRcFlagTable; cmIDEFlagTable const* DefaultRcFlagTable;

1
Source/cmVS10CudaFlagTable.h Normal file
View File

@ -0,0 +1 @@
static cmVS7FlagTable cmVS10CudaFlagTable[] = { { 0, 0, 0, 0, 0 } };

1
Source/cmVS10CudaHostFlagTable.h Normal file
View File

@ -0,0 +1 @@
static cmVS7FlagTable cmVS10CudaHostFlagTable[] = { { 0, 0, 0, 0, 0 } };