FWGS
/
waf
mirror of https://gitlab.com/ita1024/waf.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'cuda_compiler_options' into 'master' 

Minor cuda playground improvements

See merge request ita1024/waf!2311
This commit is contained in:
ita1024 2021-01-09 00:27:55 +00:00
parent 3b46768d3b 70e7209f32
commit da22d7253c
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
playground/cuda/cuda.py
View File

@ -10,7 +10,7 @@ from waflib.Tools import ccroot, c_preproc
from waflib.Configure import conf
class cuda(Task.Task):
run_str = '${NVCC} ${CUDAFLAGS} ${CXXFLAGS} ${FRAMEWORKPATH_ST:FRAMEWORKPATH} ${CPPPATH_ST:INCPATHS} ${DEFINES_ST:DEFINES} ${CXX_SRC_F}${SRC} ${CXX_TGT_F} ${TGT}'
run_str = '${NVCC} ${CUDAFLAGS} ${NVCCFLAGS_ST:CXXFLAGS} ${FRAMEWORKPATH_ST:FRAMEWORKPATH} ${CPPPATH_ST:INCPATHS} ${DEFINES_ST:DEFINES} ${CXX_SRC_F}${SRC} ${CXX_TGT_F} ${TGT}'
color = 'GREEN'
ext_in = ['.h']
vars = ['CCDEPS']
@ -32,6 +32,7 @@ def cxx_hook(self, node):
def configure(conf):
conf.find_program('nvcc', var='NVCC')
conf.find_cuda_libs()
conf.env.NVCCFLAGS_ST = "--compiler-options=%s"
@conf
def find_cuda_libs(self):

5
playground/cuda/wscript
View File

@ -18,6 +18,9 @@ def configure(conf):
conf.load('cuda', tooldir='.')
# Add a few flags to test proper passing to nvcc
conf.env.CXXFLAGS=['-fPIC', '--std=c++11']
def build(bld):
# cuda application
@ -35,7 +38,7 @@ def build(bld):
# native application
bld.program(
source = 'test.cpp',
target = 'testapp')
target = 'testapp-native')
# cuda application
bld.program(