mirror/soci
1
0
Fork 0
mirror of https://github.com/SOCI/soci.git synced 2026-05-12 22:59:05 -05:00
Code Issues Packages Projects Releases Wiki Activity

Allow multiple find_package(SOCI) calls in application using SOCI

Browse Source 
We now only define our targets if they don't exist yet to avoid errors
due to redefining them if find_package(SOCI) is done more than once.

Note that multiple calls to find_package(SOCI) that specify different
components will cause all call-sides to use the superset of all
requested components as targets are global (and hence also their link
dependencies).

Fixes #1344.

See #1346.
This commit is contained in:
Robert Adam
2026-03-19 15:58:42 +01:00
committed by Vadim Zeitlin
parent a414380ed2
commit 897dac8f9c
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
soci-config.cmake.in
+9 -3
View File
@@ -157,17 +157,23 @@ unset(__dep_dep_targets)
check_required_components(SOCI)
if (NOT DEFINED SOCI_FOUND OR SOCI_FOUND)
add_library(SOCI::SOCI INTERFACE IMPORTED)
if (NOT TARGET SOCI::SOCI)
add_library(SOCI::SOCI INTERFACE IMPORTED)
endif()
foreach (__comp IN LISTS SOCI_FIND_COMPONENTS)
target_link_libraries(SOCI::SOCI INTERFACE SOCI::${__comp})
endforeach()
# Shall be removed in SOCI v5
add_library(soci_interface_deprecated INTERFACE)
if (NOT TARGET soci_interface_deprecated)
add_library(soci_interface_deprecated INTERFACE)
endif()
target_link_libraries(soci_interface_deprecated INTERFACE SOCI::SOCI)
set_target_properties(soci_interface_deprecated PROPERTIES DEPRECATION "Use SOCI::SOCI (all-uppercase) instead of SOCI::soci")
add_library(SOCI::soci ALIAS soci_interface_deprecated)
if (NOT TARGET SOCI::soci)
add_library(SOCI::soci ALIAS soci_interface_deprecated)
endif()
if (NOT SOCI_FIND_QUIETLY)
list(JOIN SOCI_FIND_COMPONENTS ", " __components)