diff --git a/CMakeLists.txt b/CMakeLists.txt
index e39d72cc1339..e30b728415e8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -54,8 +54,18 @@ if(DEFINED ENV{VCPKG_DEFAULT_TRIPLET} AND NOT DEFINED VCPKG_TARGET_TRIPLET)
   set(VCPKG_TARGET_TRIPLET "$ENV{VCPKG_DEFAULT_TRIPLET}" CACHE STRING "")
 endif()
 
-if(DEFINED ENV{VCPKG_ROOT} AND NOT DEFINED CMAKE_TOOLCHAIN_FILE)
-  set(CMAKE_TOOLCHAIN_FILE "$ENV{VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake" CACHE STRING "")
+if(DEFINED ENV{VCPKG_ROOT})
+  if(NOT DEFINED CMAKE_TOOLCHAIN_FILE)
+    set(CMAKE_TOOLCHAIN_FILE "$ENV{VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake" CACHE STRING "")
+  endif()
+
+  # If CMake does not have a mapping for RelWithDebInfo in imported targets
+  # it will map those configuration to the first valid configuration in the targets
+  # IMPORTED_CONFIGURATIONS. In most cases this is the Debug configuration which is wrong.
+  if(NOT DEFINED CMAKE_MAP_IMPORTED_CONFIG_RELWITHDEBINFO)
+    #set(CMAKE_MAP_IMPORTED_CONFIG_RELWITHDEBINFO "RelWithDebInfo;Release;")
+  endif()
+  message(STATUS "CMAKE_MAP_IMPORTED_CONFIG_RELWITHDEBINFO = ${CMAKE_MAP_IMPORTED_CONFIG_RELWITHDEBINFO}")
 endif()
 
 # Set a default build type if none was specified
@@ -2617,9 +2627,11 @@ endif()
 option(QTKEYCHAIN "Secure credentials storage support for Live Broadcasting profiles" ON)
 if(QTKEYCHAIN)
   find_package(Qt5Keychain REQUIRED)
-  target_compile_definitions(mixxx-lib PUBLIC __QTKEYCHAIN__)
-  target_link_libraries(mixxx-lib PRIVATE ${QTKEYCHAIN_LIBRARIES})
-  target_include_directories(mixxx-lib SYSTEM PUBLIC ${QTKEYCHAIN_INCLUDE_DIRS})
+  if(DEFINED ENV{VCPKG_ROOT})
+    get_property(CONFIGS TARGET qt5keychain PROPERTY MAP_IMPORTED_CONFIG_RELWITHDEBINFO)
+    message(STATUS "qt5keychain: MAP_IMPORTED_CONFIG_RELWITHDEBINFO = ${MAP_IMPORTED_CONFIG_RELWITHDEBINFO}")
+  endif()
+  target_link_libraries(mixxx-lib PRIVATE qt5keychain)
 endif()
 
 # USB HID or/and Bulk controller support