lifemaps/qt-migration-legatus
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix GeographicLib linking: use TARGET_LINK_LIBRARIES directly and add LINK_DIRECTORIES

Browse Source 
- Changed from NGL_TARGET_LINK_LIBRARIES to TARGET_LINK_LIBRARIES for GeographicLib
- Added TARGET_LINK_DIRECTORIES to ensure linker finds the library
- Applied to LtsCoordTrans library, tools, and test executable

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
This commit is contained in:
torstenandCopilot committed 2026-10-09 14:21:36 +00:00
1 parent 9caa2573ca
commit 1c77f995e2
1 file changed
+7 -2
Download Patch File Download Diff File Expand all files Collapse all files
qt6-after/qt6-migrated-legatus/Lts/Common/LtsCoordTrans/CMakeLists.txt
+7 -2
View File
@@ -23,10 +23,11 @@ NGL_TARGET_LINK_LIBRARIES(LtsCoordTrans
Qt6::Core Qt6::Core
) )
if (GeographicLib_FOUND) if (GeographicLib_FOUND)
NGL_TARGET_LINK_LIBRARIES(LtsCoordTrans TARGET_LINK_LIBRARIES(LtsCoordTrans
PRIVATE ${GeographicLib_LIBRARIES} PRIVATE ${GeographicLib_LIBRARIES}
) )
TARGET_INCLUDE_DIRECTORIES(LtsCoordTrans PRIVATE ${GeographicLib_INCLUDE_DIRS}) TARGET_INCLUDE_DIRECTORIES(LtsCoordTrans PRIVATE ${GeographicLib_INCLUDE_DIRS})
TARGET_LINK_DIRECTORIES(LtsCoordTrans PRIVATE ${GeographicLib_LIBRARY_DIRS})
else() else()
message(STATUS "GeographicLib not found; building LtsCoordTrans without it") message(STATUS "GeographicLib not found; building LtsCoordTrans without it")
endif() endif()
@@ -67,11 +68,12 @@ IF(TARGET LtsCoordTrans)
SET(_tools lonlat2mgrs mgrs2lonlat) SET(_tools lonlat2mgrs mgrs2lonlat)
FOREACH(_tool ${_tools}) FOREACH(_tool ${_tools})
NGL_ADD_EXECUTABLE(ALL ${_tool} ${_tool}.cpp) NGL_ADD_EXECUTABLE(ALL ${_tool} ${_tool}.cpp)
NGL_TARGET_LINK_LIBRARIES(${_tool} TARGET_LINK_LIBRARIES(${_tool}
Qt6::Core Qt6::Core
${GeographicLib_LIBRARIES} ${GeographicLib_LIBRARIES}
) )
TARGET_INCLUDE_DIRECTORIES(${_tool} PRIVATE ${GeographicLib_INCLUDE_DIRS}) TARGET_INCLUDE_DIRECTORIES(${_tool} PRIVATE ${GeographicLib_INCLUDE_DIRS})
TARGET_LINK_DIRECTORIES(${_tool} PRIVATE ${GeographicLib_LIBRARY_DIRS})
NGL_INSTALL_TARGET(${_tool}) NGL_INSTALL_TARGET(${_tool})
ENDFOREACH() ENDFOREACH()
ENDIF() ENDIF()
@@ -95,5 +97,8 @@ IF(BUILD_TESTING AND TARGET LtsCoordTrans)
${GeographicLib_LIBRARIES} ${GeographicLib_LIBRARIES}
) )
TARGET_INCLUDE_DIRECTORIES(lts_coord_trans_unit_test PRIVATE ${GeographicLib_INCLUDE_DIRS}) TARGET_INCLUDE_DIRECTORIES(lts_coord_trans_unit_test PRIVATE ${GeographicLib_INCLUDE_DIRS})
if (GeographicLib_FOUND)
TARGET_LINK_DIRECTORIES(lts_coord_trans_unit_test PRIVATE ${GeographicLib_LIBRARY_DIRS})
endif()
ADD_TEST(NAME lts_coord_trans_unit_test COMMAND $<TARGET_FILE:lts_coord_trans_unit_test>) ADD_TEST(NAME lts_coord_trans_unit_test COMMAND $<TARGET_FILE:lts_coord_trans_unit_test>)
ENDIF() ENDIF()