From cbb147c6faf4dd60f4d5ed97de05873aa4812566 Mon Sep 17 00:00:00 2001 From: TimZnr Date: Thu, 3 Nov 2022 08:59:26 +0100 Subject: [PATCH] Lil clean up for cmakelists --- CMakeLists.txt | 32 +++++++++++++++----------------- 1 file changed, 15 insertions(+), 17 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 1ff0bc6..ab2ae22 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -5,18 +5,21 @@ include(CTest) enable_testing() find_package( OpenCV REQUIRED ) -include_directories( ${OpenCV_INCLUDE_DIRS} ) -include_directories( ${CMAKE_CURRENT_SOURCE_DIR}/Input ) -include_directories( ${CMAKE_CURRENT_SOURCE_DIR}/Processing) -include_directories( ${CMAKE_CURRENT_SOURCE_DIR}/ControlModule) -include_directories( ${CMAKE_CURRENT_SOURCE_DIR}/Interpreter) -include_directories( ${CMAKE_CURRENT_SOURCE_DIR}/IntersectionHandler) -link_directories( ${Input_SOURCE_DIRS} ) -link_directories( ${Processing_SOURCE_DIRS} ) -link_directories( ${ControlModule_SOURCE_DIRS} ) -link_directories( ${Interpreter_SOURCE_DIRS} ) -link_directories( ${IntersectionHandler_SOURCE_DIRS} ) +include_directories( ${OpenCV_INCLUDE_DIRS} + ${CMAKE_CURRENT_SOURCE_DIR}/Input + ${CMAKE_CURRENT_SOURCE_DIR}/Processing + ${CMAKE_CURRENT_SOURCE_DIR}/ControlModule + ${CMAKE_CURRENT_SOURCE_DIR}/Interpreter + ${CMAKE_CURRENT_SOURCE_DIR}/IntersectionHandler +) + +link_directories( ${Input_SOURCE_DIRS} + ${Processing_SOURCE_DIRS} + ${ControlModule_SOURCE_DIRS} + ${Interpreter_SOURCE_DIRS} + ${IntersectionHandler_SOURCE_DIRS} +) add_subdirectory(Input) add_subdirectory(Processing) @@ -32,12 +35,7 @@ target_include_directories(IntersectionHandler PRIVATE .) add_executable(lfr_image_processing lfr.cpp) -target_link_libraries( lfr_image_processing ${OpenCV_LIBS}) -target_link_libraries( lfr_image_processing Input ) -target_link_libraries( lfr_image_processing Processing ) -target_link_libraries( lfr_image_processing ControlModule ) -target_link_libraries( lfr_image_processing Interpreter ) -target_link_libraries( lfr_image_processing IntersectionHandler ) +target_link_libraries( lfr_image_processing ${OpenCV_LIBS} Input Processing ControlModule Interpreter IntersectionHandler ) set(CPACK_PROJECT_NAME ${PROJECT_NAME}) set(CPACK_PROJECT_VERSION ${PROJECT_VERSION})