Skip to content

Commit 35f4ef2

Browse files
author
Max Krogius
committed
Fix transitive dependencies. Fixes #78
1 parent ab14421 commit 35f4ef2

File tree

2 files changed

+17
-5
lines changed

2 files changed

+17
-5
lines changed

CMake/apriltagConfig.cmake

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
include("${CMAKE_CURRENT_LIST_DIR}/apriltagTargets.cmake")
2+
3+
if (NOT MSVC)
4+
include(CMakeFindDependencyMacro)
5+
find_dependency(Threads)
6+
endif()
7+

CMakeLists.txt

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
cmake_minimum_required(VERSION 3.1)
1+
cmake_minimum_required(VERSION 3.10)
22
project(apriltag)
33

44
find_package(OpenCV QUIET)
@@ -20,7 +20,7 @@ if (MSVC)
2020
target_link_libraries(${PROJECT_NAME} ${PTHREAD_LIBRARIES} winmm)
2121
else()
2222
find_package(Threads REQUIRED)
23-
target_link_libraries(${PROJECT_NAME} Threads::Threads m)
23+
target_link_libraries(${PROJECT_NAME} PUBLIC Threads::Threads m)
2424
endif()
2525

2626
set_target_properties(${PROJECT_NAME} PROPERTIES SOVERSION 3 VERSION 3.1.0)
@@ -38,7 +38,7 @@ set_target_properties(${PROJECT_NAME} PROPERTIES
3838

3939

4040
# install library
41-
install(TARGETS ${PROJECT_NAME} EXPORT apriltag
41+
install(TARGETS ${PROJECT_NAME} EXPORT apriltagTargets
4242
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
4343
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
4444
)
@@ -51,10 +51,15 @@ foreach(HEADER ${HEADER_FILES})
5151
endforeach()
5252

5353
# export library
54-
install(EXPORT apriltag
54+
install(EXPORT apriltagTargets
55+
FILE apriltagTargets.cmake
56+
NAMESPACE apriltag::
5557
DESTINATION share/apriltag/cmake
56-
FILE apriltagConfig.cmake
5758
)
59+
install(FILES CMake/apriltagConfig.cmake DESTINATION share/apriltag/cmake)
60+
export(TARGETS apriltag
61+
NAMESPACE apriltag::
62+
FILE apriltagTargets.cmake)
5863

5964
FILE(READ apriltag.pc.in PKGC)
6065
STRING(REGEX REPLACE "^prefix=" "prefix=${CMAKE_INSTALL_PREFIX}" PKGC_CONF "${PKGC}" )

0 commit comments

Comments
 (0)