diff --git a/CMakeLists.txt b/CMakeLists.txt index 0383add..f03c98c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.5) +cmake_minimum_required(VERSION 3.15) project (tkDNN) set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake) @@ -17,7 +17,13 @@ if(DEBUG) add_definitions(-DDEBUG) endif() -add_definitions(-DTKDNN_PATH="${CMAKE_CURRENT_SOURCE_DIR}") +if(TKDNN_PATH) + message("SET TKDNN_PATH:"${TKDNN_PATH}) + add_definitions(-DTKDNN_PATH="${TKDNN_PATH}") +else() + add_definitions(-DTKDNN_PATH="${CMAKE_CURRENT_SOURCE_DIR}") +endif() + #------------------------------------------------------------------------------- # CUDA @@ -42,6 +48,7 @@ target_link_libraries(kernels ${CUDA_CUBLAS_LIBRARIES}) # External Libraries #------------------------------------------------------------------------------- find_package(Eigen3 REQUIRED) +message("Eigen DIR: " ${EIGEN3_INCLUDE_DIR}) include_directories(${EIGEN3_INCLUDE_DIR}) find_package(OpenCV REQUIRED) @@ -85,6 +92,7 @@ foreach(test_SRC ${darknet_SRC}) set(test_NAME test_${test_NAME}) add_executable(${test_NAME} ${test_SRC}) target_link_libraries(${test_NAME} tkDNN) + install(TARGETS ${test_NAME} DESTINATION bin) endforeach() # MOBILENET @@ -131,7 +139,10 @@ target_link_libraries(demo tkDNN) message("install dir:" ${CMAKE_INSTALL_PREFIX}) install(DIRECTORY include/ DESTINATION include/) install(TARGETS tkDNN kernels DESTINATION lib) +install(TARGETS test_simple test_mnist test_mnistRT test_rtinference demo map_demo DESTINATION bin) install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/cmake/" # source directory DESTINATION "share/tkDNN/cmake/" # target directory ) - +install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/tests/" # source directory + DESTINATION "share/tkDNN/tests" # target directory +)