summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--cmake/Functions.cmake2
-rw-r--r--src/core/api/configure.cmake2
2 files changed, 2 insertions, 2 deletions
diff --git a/cmake/Functions.cmake b/cmake/Functions.cmake
index e32037fd5..7bbf8e759 100644
--- a/cmake/Functions.cmake
+++ b/cmake/Functions.cmake
@@ -476,7 +476,7 @@ function(add_linker_options target buildDir completeStatic)
if(NOT completeStatic)
target_link_options(${cmakeTarget} PRIVATE "$<$<CONFIG:${config}>:@${archives_rsp}>")
endif()
- target_link_options(${cmakeTarget} PRIVATE "$<$<CONFIG:${config}>:@${libs_rsp}>")
+ target_link_options(${cmakeTarget} PRIVATE "$<$<CONFIG:${config}>:@${ldir_rsp}>" "$<$<CONFIG:${config}>:@${libs_rsp}>")
endif()
if(WIN32)
get_copy_of_response_file(objects_rsp ${target} objects)
diff --git a/src/core/api/configure.cmake b/src/core/api/configure.cmake
index df65aaa69..762f4bdd6 100644
--- a/src/core/api/configure.cmake
+++ b/src/core/api/configure.cmake
@@ -7,7 +7,7 @@ if(NOT QT_CONFIGURE_RUNNING)
find_package(GLIB2 COMPONENTS GIO)
find_package(GSSAPI)
find_package(PkgConfig)
- if(PkgConfig_FOUND)
+ if(PkgConfig_FOUND AND QT_FEATURE_pkg_config)
pkg_check_modules(ALSA alsa IMPORTED_TARGET)
pkg_check_modules(PULSEAUDIO libpulse>=0.9.10 libpulse-mainloop-glib)
pkg_check_modules(XDAMAGE xdamage)