apoorva/greenhouse
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix cuda build downstream (#4)

Browse Source 
* Cuda flags should not be exported to downstream targets

Signed-off-by: Shane Loretz <sloretz@osrfoundation.org>

* Fix c linkage with C++ cuda code

Signed-off-by: Shane Loretz <sloretz@osrfoundation.org>
This commit is contained in:
Shane Loretz 2019-10-09 11:08:29 -07:00 committed by GitHub
parent 4ad6ed7b0a
commit c8d68fbe1e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 1 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -163,7 +163,7 @@ if(DARKNET_CUDA)
endif()
add_library(darknet SHARED ${darknet_lib_c_sources} ${darknet_lib_cpp_sources} ${darknet_cuda_sources})
target_compile_options(darknet INTERFACE
target_compile_options(darknet PRIVATE
$<$<COMPILE_LANGUAGE:CUDA>:${DARKNET_VENDOR_CUDA_FLAGS}>
)
target_compile_definitions(darknet PUBLIC GPU=1)

10
include/darknet_vendor/darknet_vendor.h
View File

@ -15,18 +15,8 @@
#ifndef DARKNET_VENDOR__DARKNET_VENDOR_H_
#define DARKNET_VENDOR__DARKNET_VENDOR_H_
#ifdef __cplusplus
extern "C"
{
#endif
#include <darknet.h>
#include <darknet_vendor/version.h>
#ifdef __cplusplus
}
#endif
#endif // DARKNET_VENDOR__DARKNET_VENDOR_H_