Skip to content

Commit

Permalink
Switch order (for dependency satisfaction) of the MASTER_LIBRARIES
Browse files Browse the repository at this point in the history
  • Loading branch information
Andrei Costinescu committed Jan 17, 2022
1 parent d80ac6e commit 2537344
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ target_include_directories(${COMM_LIB}
if (WITH_OPENCV)
set(OPENCV_COMM_LIB_SHARED ${PROJECT_TARGET}_OpenCV)
add_library(${OPENCV_COMM_LIB_SHARED} SHARED ${OPENCV_STUFF})
target_link_libraries(${OPENCV_COMM_LIB_SHARED} ${PROJECT_TARGET} ${OpenCV_LIBS} ${MASTER_LIBRARIES})
target_link_libraries(${OPENCV_COMM_LIB_SHARED} ${COMM_LIB_SHARED} ${OpenCV_LIBS} ${MASTER_LIBRARIES})
target_include_directories(${OPENCV_COMM_LIB_SHARED}
PUBLIC
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
Expand All @@ -71,15 +71,15 @@ if (WITH_OPENCV)

set(OPENCV_COMM_LIB "${PROJECT_TARGET}_OpenCV_static")
add_library(${OPENCV_COMM_LIB} ${OPENCV_STUFF})
target_link_libraries(${OPENCV_COMM_LIB} ${PROJECT_TARGET}_static ${OpenCV_LIBS} ${MASTER_LIBRARIES})
target_link_libraries(${OPENCV_COMM_LIB} ${COMM_LIB} ${OpenCV_LIBS} ${MASTER_LIBRARIES})
target_include_directories(${OPENCV_COMM_LIB}
PUBLIC
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
$<INSTALL_INTERFACE:include>
)
endif ()

set(MASTER_LIBRARIES ${COMM_LIB} ${OPENCV_COMM_LIB} ${MASTER_LIBRARIES})
set(MASTER_LIBRARIES ${OPENCV_COMM_LIB} ${COMM_LIB} ${MASTER_LIBRARIES})

add_subdirectory(tests)

Expand Down

0 comments on commit 2537344

Please sign in to comment.