Skip to content

Commit 7daa92b

Browse files
committed
Avoid using pkg-config prefix_LINK_LIBRARIES variable
The `_STATIC` version of this variable is apparently not always (or never?) populated breaking static linking. So we just use `LDFLAGS` instead. Note that we also don't use the imported target provided by the pkg-config find module because no static version of it seems to exist.
1 parent 97fd53f commit 7daa92b

File tree

1 file changed

+4
-10
lines changed

1 file changed

+4
-10
lines changed

cmake/modules/3rdPartyFunctions.cmake

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -344,16 +344,10 @@ function (use_pkg_config_module)
344344
else ()
345345
set(PKG_CONFIG_CHECK_SUFFIX "")
346346
endif ()
347-
set_property(
348-
TARGET ${ARGS_TARGET_NAME} PROPERTY INTERFACE_LINK_LIBRARIES
349-
"${PKG_CHECK_MODULES_RESULT${PKG_CONFIG_CHECK_SUFFIX}_LINK_LIBRARIES}")
350-
set_property(
351-
TARGET ${ARGS_TARGET_NAME} PROPERTY INTERFACE_INCLUDE_DIRECTORIES
352-
"${PKG_CHECK_MODULES_RESULT${PKG_CONFIG_CHECK_SUFFIX}_INCLUDE_DIRS}")
353-
set_property(TARGET ${ARGS_TARGET_NAME}
354-
PROPERTY INTERFACE_COMPILE_OPTIONS "${PKG_CHECK_MODULES_RESULT${PKG_CONFIG_CHECK_SUFFIX}_CFLAGS_OTHER}")
355-
set_property(TARGET ${ARGS_TARGET_NAME}
356-
PROPERTY INTERFACE_LINK_OPTIONS "${PKG_CHECK_MODULES_RESULT${PKG_CONFIG_CHECK_SUFFIX}_LDFLAGS_OTHER}")
347+
set_property(TARGET ${ARGS_TARGET_NAME} PROPERTY INTERFACE_COMPILE_OPTIONS
348+
"${PKG_CHECK_MODULES_RESULT${PKG_CONFIG_CHECK_SUFFIX}_CFLAGS}")
349+
set_property(TARGET ${ARGS_TARGET_NAME} PROPERTY INTERFACE_LINK_LIBRARIES
350+
"${PKG_CHECK_MODULES_RESULT${PKG_CONFIG_CHECK_SUFFIX}_LDFLAGS}")
357351
endif ()
358352

359353
set("${ARGS_PKG_CONFIG_MODULES_VARIABLE}"

0 commit comments

Comments
 (0)