fix cmake

CMakeLists.txt

@@ -1,25 +1,23 @@
-cmake_minimum_required(VERSION 2.8)
+cmake_minimum_required(VERSION 3.5)
+
 project (tkDNN)
+set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake)
+set(CMAKE_BUILD_TYPE "Release")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -fPIC")
+include_directories(${CMAKE_CURRENT_SOURCE_DIR}/include)
 
-set(TEST_DATA true CACHE BOOL "If true download deps")
+# project specific flags
-
-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(TEST_DATA false CACHE BOOL "If true download deps" FORCE)
-	message("Finished dowloading test weights")
-endif()
-
 if(DEBUG)
     add_definitions(-DDEBUG)
 endif()
 
-find_package(CUDA REQUIRED)
+
-find_package(OpenCV REQUIRED)
+#-------------------------------------------------------------------------------
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DOPENCV")
+# CUDA
+#-------------------------------------------------------------------------------
+SET(CUDA_SEPARABLE_COMPILATION ON)
+find_package(CUDA 9.0 REQUIRED)
+#set(CUDA_NVCC_FLAGS "${CUDA_NVCC_FLAGS} -arch=sm_30 --compiler-options '-fPIC'")
 
 # compile Discovery only if TensorRT is installed
 find_library(NVINFER NAMES nvinfer)
@@ -29,10 +27,22 @@ if(NVINFER STREQUAL "NVINFER-NOTFOUND")
 		     /usr/local/cuda/targets/x86_64-linux/lib/)
 endif()
 
+# compile
 file(GLOB tkdnn_CUSRC "src/kernels/*.cu")
 cuda_include_directories(${CMAKE_CURRENT_SOURCE_DIR}/include ${CUDA_INCLUDE_DIRS} ${NVINFER_INCLUDES})
 cuda_add_library(kernels SHARED ${tkdnn_CUSRC})
 
+
+#-------------------------------------------------------------------------------
+# External Libraries
+#-------------------------------------------------------------------------------
+find_package(OpenCV REQUIRED)
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DOPENCV")
+
+
+#-------------------------------------------------------------------------------
+# Build Libraries
+#-------------------------------------------------------------------------------
 file(GLOB tkdnn_SRC "src/*.cpp")
 set(tkdnn_LIBS kernels ${CUDA_LIBRARIES} ${CUDA_CUBLAS_LIBRARIES} -lcudnn -lnvinfer ${OpenCV_LIBS})
 
@@ -88,7 +98,10 @@ target_link_libraries(test_rtinference tkDNN)
 add_executable(yolo3_demo demo/demo/demo.cpp)
 target_link_libraries(yolo3_demo tkDNN)
 
-#install
+
+#-------------------------------------------------------------------------------
+# Install
+#-------------------------------------------------------------------------------
 #if (CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
 #    set (CMAKE_INSTALL_PREFIX "${CMAKE_BINARY_DIR}/install" 
 #         CACHE PATH "default install path" FORCE)
@@ -100,3 +113,18 @@ install(TARGETS tkDNN kernels DESTINATION lib)
 install(FILES "${CMAKE_SOURCE_DIR}/${CMAKE_PROJECT_NAME}Config.cmake" # source directory
         DESTINATION "share/${CMAKE_PROJECT_NAME}/cmake/" # target directory
 )
+
+#-------------------------------------------------------------------------------
+# Prepare for test
+#-------------------------------------------------------------------------------
+set(TEST_DATA true CACHE BOOL "If true download 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(TEST_DATA false CACHE BOOL "If true download deps" FORCE)
+	message("Finished dowloading test weights")
+endif()
+