From 6656c3d0e863e1c8fed68a4de8d5bb3186acb819 Mon Sep 17 00:00:00 2001
From: Francesco Gatti <gattifrancesco@hotmail.it>
Date: Fri, 28 Jun 2019 17:44:32 +0200
Subject: [PATCH] fix cmake

---
 CMakeLists.txt    |  6 +++---
 README.md         |  2 +-
 tkDNNConfig.cmake | 24 ++++++++++++++++++++++--
 3 files changed, 26 insertions(+), 6 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index fef13a0..34130fd 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,15 +1,15 @@
 cmake_minimum_required(VERSION 2.8)
 project (tkDNN)
 
-set(BUILD_DEPS true CACHE BOOL "If true download deps")
+set(TEST_DATA true CACHE BOOL "If true download deps")
 
-if( ${BUILD_DEPS} )
+if( ${TEST_DATA} )
 	message("Launching pre-build dependency installer script...")
 
     execute_process (COMMAND bash -c "bash build_models.sh download"
         WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/tests)
 
-	set(BUILD_DEPS false CACHE BOOL "If true download deps" FORCE)
+	set(TEST_DATA false CACHE BOOL "If true download deps" FORCE)
 	message("Finished dowloading test weights")
 endif()
 
diff --git a/README.md b/README.md
index 9441e0f..b166f63 100644
--- a/README.md
+++ b/README.md
@@ -20,7 +20,7 @@ Build with cmake
 mkdir build
 cd build
 cmake ..
-# use -DBUILD_DEPS=False to skip dataset download
+# use -DTEST_DATA=False to skip dataset download
 make
 ```
 during the cmake configuration it will be dowloaded the weights needed for running
diff --git a/tkDNNConfig.cmake b/tkDNNConfig.cmake
index 8665415..fd06286 100644
--- a/tkDNNConfig.cmake
+++ b/tkDNNConfig.cmake
@@ -1,3 +1,7 @@
+message("-- Found tkDNN")
+set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR})
+set(CMAKE_CXX_FLAGS  "${CMAKE_CXX_FLAGS} --std=c++11 -fPIC")
+
 find_package(CUDA REQUIRED)
 find_package(OpenCV REQUIRED)
 find_library(NVINFER NAMES nvinfer)
@@ -6,5 +10,21 @@ if(NVINFER STREQUAL "NVINFER-NOTFOUND")
     link_directories(/usr/local/nvidia/tensorrt/targets/x86_64-linux-gnu/lib/ 
 		     /usr/local/cuda/targets/x86_64-linux/lib/)
 endif()
-set(tkDNN_INCLUDE_DIRS ${CUDA_INCLUDE_DIRS} ${OPENCV_INCLUDE_DIRS} ${NVINFER_INCLUDES})
-set(tkDNN_LIBRARIES tkDNN kernels ${CUDA_LIBRARIES} ${CUDA_CUBLAS_LIBRARIES} -lcudnn -lnvinfer ${OpenCV_LIBS})
+
+set(tkDNN_INCLUDE_DIRS 
+	${CUDA_INCLUDE_DIRS} 
+	${OPENCV_INCLUDE_DIRS} 
+    ${NVINFER_INCLUDES}
+)
+
+set(tkDNN_LIBRARIES 
+    tkDNN 
+    kernels 
+    ${CUDA_LIBRARIES} 
+    ${CUDA_CUBLAS_LIBRARIES} 
+    -lcudnn 
+    -lnvinfer 
+    ${OpenCV_LIBS}
+)
+
+set(tkDNN_FOUND true)