From d08f7d6255cebe54696e7ae715b955b68d88729e Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Mon, 23 Feb 2015 08:24:52 -0800
Subject: [PATCH] check if QXmpp is dynamic or static

---
 cmake/modules/FindQxmpp.cmake | 8 +++++++-
 interface/CMakeLists.txt      | 4 ++--
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/cmake/modules/FindQxmpp.cmake b/cmake/modules/FindQxmpp.cmake
index 8fbc63e9dc..7c1579835d 100644
--- a/cmake/modules/FindQxmpp.cmake
+++ b/cmake/modules/FindQxmpp.cmake
@@ -26,6 +26,10 @@ find_path(QXMPP_INCLUDE_DIRS QXmppClient.h PATH_SUFFIXES include/qxmpp HINTS ${Q
 find_library(QXMPP_LIBRARY_RELEASE NAMES qxmpp PATH_SUFFIXES lib HINTS ${QXMPP_SEARCH_DIRS})
 find_library(QXMPP_LIBRARY_DEBUG NAMES qxmpp_d PATH_SUFFIXES lib HINTS ${QXMPP_SEARCH_DIRS})
 
+if (WIN32)
+  find_path(QXMPP_DLL_PATH NAMES qxmpp.dll PATH_SUFFIXES lib HINTS ${QXMPP_SEARCH_DIRS})
+endif ()
+
 find_package(Qt5 COMPONENTS Xml REQUIRED)
 
 include(SelectLibraryConfigurations)
@@ -36,4 +40,6 @@ set(QXMPP_LIBRARIES "${QXMPP_LIBRARY}" Qt5::Xml)
 include(FindPackageHandleStandardArgs)
 find_package_handle_standard_args(QXmpp DEFAULT_MSG QXMPP_INCLUDE_DIRS QXMPP_LIBRARIES QXMPP_LIBRARY)
 
-mark_as_advanced(QXMPP_INCLUDE_DIRS QXMPP_LIBRARIES QXMPP_SEARCH_DIRS)
\ No newline at end of file
+if (QXMPP_DLL_PATH)
+  add_paths_to_lib_paths(${QXMPP_DLL_PATH})
+endif ()
\ No newline at end of file
diff --git a/interface/CMakeLists.txt b/interface/CMakeLists.txt
index 2e0120dfc8..1c27d8f9db 100644
--- a/interface/CMakeLists.txt
+++ b/interface/CMakeLists.txt
@@ -175,8 +175,8 @@ if (RTMIDI_FOUND AND NOT DISABLE_RTMIDI AND APPLE)
   target_link_libraries(${TARGET_NAME} ${CoreMIDI})
 endif ()
 
-if (QXMPP_FOUND AND NOT DISABLE_QXMPP AND WIN32)
-  # assume we're linking a static Qt on windows
+if (QXMPP_FOUND AND NOT DISABLE_QXMPP AND WIN32 AND NOT QXMPP_DLL_PATH)
+  # if we have no QXmpp DLL path, assume we're linking a static QXmpp on windows
   add_definitions(-DQXMPP_STATIC) 
 endif ()