diff --git a/scripts/cmake/ConanSetup.cmake b/scripts/cmake/ConanSetup.cmake index d3cd29dc5890ad1e27b75b4fe78de3bec1e2423b..0e1eb1080503c035cfee0e1782a056354b4f7cb3 100644 --- a/scripts/cmake/ConanSetup.cmake +++ b/scripts/cmake/ConanSetup.cmake @@ -91,7 +91,6 @@ if(APPLE) endif() if(MSVC) set(CONAN_IMPORTS ${CONAN_IMPORTS} "bin, *.dll* -> ./bin") - set(CONAN_IMPORTS ${CONAN_IMPORTS} "plugins/platforms, *.dll* -> ./bin/platforms") endif() if(UNIX AND NOT APPLE) set(CONAN_IMPORTS ${CONAN_IMPORTS} "lib, *.so* -> ./lib") diff --git a/scripts/cmake/packaging/PackagingMac.cmake b/scripts/cmake/packaging/PackagingMac.cmake index 8854394bedc47cd48749a4073dad2fa6f05856cd..3c5fb14a10e9a0a2f1819fcd83ee3ace016fd16f 100644 --- a/scripts/cmake/packaging/PackagingMac.cmake +++ b/scripts/cmake/packaging/PackagingMac.cmake @@ -27,8 +27,8 @@ endif() if(OGS_BUILD_GUI) install_qt5_plugin("Qt5::QCocoaIntegrationPlugin" QT_PLUGINS) - file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/qt.conf" + file(WRITE "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/qt.conf" "[Paths]\nPlugins = ../${_qt_plugin_dir}\n") - install(FILES "${CMAKE_CURRENT_BINARY_DIR}/qt.conf" + install(FILES "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/qt.conf" DESTINATION bin COMPONENT ogs_gui) endif() diff --git a/scripts/cmake/packaging/PackagingMacros.cmake b/scripts/cmake/packaging/PackagingMacros.cmake index ba153c854b3227a2f324c150419965f7555f67b3..de831ab953690faa5d739983498059b7f7b0fc23 100644 --- a/scripts/cmake/packaging/PackagingMacros.cmake +++ b/scripts/cmake/packaging/PackagingMacros.cmake @@ -75,6 +75,7 @@ macro(install_qt5_plugin _qt_plugin_name _qt_plugins_var) set(_qt_plugin_dir "plugins") endif() set(_qt_plugin_dest "${_qt_plugin_dir}/${_qt_plugin_type}") + file(COPY "${_qt_plugin_path}" DESTINATION "${_qt_plugin_dest}") install(FILES "${_qt_plugin_path}" DESTINATION "${_qt_plugin_dest}" ${COMPONENT}) diff --git a/scripts/cmake/packaging/PackagingWin.cmake b/scripts/cmake/packaging/PackagingWin.cmake index 983881a9e2d893aaaef6ef2a5b51561d09b5eea3..48ea5fdbeb8b85c4270285c3dff3a3837e91cdad 100644 --- a/scripts/cmake/packaging/PackagingWin.cmake +++ b/scripts/cmake/packaging/PackagingWin.cmake @@ -29,8 +29,8 @@ endif() if(OGS_BUILD_GUI) install_qt5_plugin("Qt5::QWindowsIntegrationPlugin" QT_PLUGINS) - file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/qt.conf" + file(WRITE "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/qt.conf" "[Paths]\nPlugins = ../${_qt_plugin_dir}\n") - install(FILES "${CMAKE_CURRENT_BINARY_DIR}/qt.conf" + install(FILES "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/qt.conf" DESTINATION bin COMPONENT ogs_gui) endif()