From c8d68fbe1e3c1d74c9e3837b2c9a256546fada9d Mon Sep 17 00:00:00 2001 From: Shane Loretz Date: Wed, 9 Oct 2019 11:08:29 -0700 Subject: [PATCH] Fix cuda build downstream (#4) * Cuda flags should not be exported to downstream targets Signed-off-by: Shane Loretz * Fix c linkage with C++ cuda code Signed-off-by: Shane Loretz --- CMakeLists.txt | 2 +- include/darknet_vendor/darknet_vendor.h | 10 ---------- 2 files changed, 1 insertion(+), 11 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 868da894..d66643c5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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 $<$:${DARKNET_VENDOR_CUDA_FLAGS}> ) target_compile_definitions(darknet PUBLIC GPU=1) diff --git a/include/darknet_vendor/darknet_vendor.h b/include/darknet_vendor/darknet_vendor.h index 0543b1dc..862aa895 100644 --- a/include/darknet_vendor/darknet_vendor.h +++ b/include/darknet_vendor/darknet_vendor.h @@ -15,18 +15,8 @@ #ifndef DARKNET_VENDOR__DARKNET_VENDOR_H_ #define DARKNET_VENDOR__DARKNET_VENDOR_H_ -#ifdef __cplusplus -extern "C" -{ -#endif - #include #include -#ifdef __cplusplus -} -#endif - - #endif // DARKNET_VENDOR__DARKNET_VENDOR_H_