Skip to content
Snippets Groups Projects
Commit e539de27 authored by Lars Bilke's avatar Lars Bilke Committed by Dmitri Naumov
Browse files

[CMake] Fixed Qt platform installation in build-dir.

parent 7740fa66
No related branches found
No related tags found
No related merge requests found
...@@ -91,7 +91,6 @@ if(APPLE) ...@@ -91,7 +91,6 @@ if(APPLE)
endif() endif()
if(MSVC) if(MSVC)
set(CONAN_IMPORTS ${CONAN_IMPORTS} "bin, *.dll* -> ./bin") set(CONAN_IMPORTS ${CONAN_IMPORTS} "bin, *.dll* -> ./bin")
set(CONAN_IMPORTS ${CONAN_IMPORTS} "plugins/platforms, *.dll* -> ./bin/platforms")
endif() endif()
if(UNIX AND NOT APPLE) if(UNIX AND NOT APPLE)
set(CONAN_IMPORTS ${CONAN_IMPORTS} "lib, *.so* -> ./lib") set(CONAN_IMPORTS ${CONAN_IMPORTS} "lib, *.so* -> ./lib")
......
...@@ -27,8 +27,8 @@ endif() ...@@ -27,8 +27,8 @@ endif()
if(OGS_BUILD_GUI) if(OGS_BUILD_GUI)
install_qt5_plugin("Qt5::QCocoaIntegrationPlugin" QT_PLUGINS) 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") "[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) DESTINATION bin COMPONENT ogs_gui)
endif() endif()
...@@ -75,6 +75,7 @@ macro(install_qt5_plugin _qt_plugin_name _qt_plugins_var) ...@@ -75,6 +75,7 @@ macro(install_qt5_plugin _qt_plugin_name _qt_plugins_var)
set(_qt_plugin_dir "plugins") set(_qt_plugin_dir "plugins")
endif() endif()
set(_qt_plugin_dest "${_qt_plugin_dir}/${_qt_plugin_type}") set(_qt_plugin_dest "${_qt_plugin_dir}/${_qt_plugin_type}")
file(COPY "${_qt_plugin_path}" DESTINATION "${_qt_plugin_dest}")
install(FILES "${_qt_plugin_path}" install(FILES "${_qt_plugin_path}"
DESTINATION "${_qt_plugin_dest}" DESTINATION "${_qt_plugin_dest}"
${COMPONENT}) ${COMPONENT})
......
...@@ -29,8 +29,8 @@ endif() ...@@ -29,8 +29,8 @@ endif()
if(OGS_BUILD_GUI) if(OGS_BUILD_GUI)
install_qt5_plugin("Qt5::QWindowsIntegrationPlugin" QT_PLUGINS) 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") "[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) DESTINATION bin COMPONENT ogs_gui)
endif() endif()
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment