Merge pull request #112 from cristian64/svg_plugin_windows

Configure CMake to install Qt6Svg.dll and qsvg.dll in build.
aldelaro5 · Mar 9, 2024 · dc271b9 · dc271b9
2 parents 541258a + 7ff7848
commit dc271b9
Show file tree

Hide file tree

Showing 2 changed files with 38 additions and 18 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -61,7 +61,7 @@ jobs:
       - name: Install Dependencies
         run: |
           sudo apt-get update
-          sudo apt install cmake libevdev-dev qt6-base-private-dev libqt6svg6 libgl1-mesa-dev libfuse2
+          sudo apt install cmake libevdev-dev qt6-base-private-dev libqt6svg6 libqt6svg6-dev libgl1-mesa-dev libfuse2
         shell: bash
 
       - name: Install GCC 10 and G++ 10

diff --git a/Source/CMakeLists.txt b/Source/CMakeLists.txt
@@ -48,6 +48,9 @@ set(CMAKE_INCLUDE_CURRENT_DIR ON)
 find_package(Qt6Widgets REQUIRED)
 find_package(Qt6Core REQUIRED)
 find_package(Qt6Gui REQUIRED)
+if (NOT APPLE)
+    find_package(Qt6Svg REQUIRED)
+endif ()
 
 set(CMAKE_AUTOMOC ON)
 set(CMAKE_AUTORCC ON)
@@ -61,45 +64,62 @@ add_executable(dolphin-memory-engine ${GUI_TYPE} ${SRCS})
 target_link_libraries(dolphin-memory-engine Qt6::Widgets)
 target_link_libraries(dolphin-memory-engine Qt6::Gui)
 target_link_libraries(dolphin-memory-engine Qt6::Core)
+if (NOT APPLE)
+    target_link_libraries(dolphin-memory-engine Qt6::Svg)
+endif ()
 
 if(WIN32)
     set_target_properties(dolphin-memory-engine PROPERTIES OUTPUT_NAME DolphinMemoryEngine)
     if($<CONFIG:Debug>)
         get_target_property(WIDGETDLL Qt6::Widgets IMPORTED_LOCATION_DEBUG)
-		get_target_property(COREDLL Qt6::Widgets IMPORTED_LOCATION_DEBUG)
-		get_target_property(GUIDLL Qt6::Widgets IMPORTED_LOCATION_DEBUG)
+        get_target_property(COREDLL Qt6::Widgets IMPORTED_LOCATION_DEBUG)
+        get_target_property(GUIDLL Qt6::Widgets IMPORTED_LOCATION_DEBUG)
+        get_target_property(SVGDLL Qt6::Widgets IMPORTED_LOCATION_DEBUG)
     else($<CONFIG:Debug>)
         get_target_property(WIDGETDLL Qt6::Widgets IMPORTED_LOCATION_RELEASE)
-		get_target_property(COREDLL Qt6::Widgets IMPORTED_LOCATION_RELEASE)
-		get_target_property(GUIDLL Qt6::Widgets IMPORTED_LOCATION_RELEASE)
+        get_target_property(COREDLL Qt6::Widgets IMPORTED_LOCATION_RELEASE)
+        get_target_property(GUIDLL Qt6::Widgets IMPORTED_LOCATION_RELEASE)
+        get_target_property(SVGDLL Qt6::Widgets IMPORTED_LOCATION_RELEASE)
     endif($<CONFIG:Debug>)
     add_custom_command(
-		TARGET dolphin-memory-engine POST_BUILD
-		COMMAND ${CMAKE_COMMAND} -E copy_if_different
-			$<TARGET_FILE:Qt6::Widgets>
-			$<TARGET_FILE_DIR:dolphin-memory-engine>
-		TARGET dolphin-memory-engine POST_BUILD
-		COMMAND ${CMAKE_COMMAND} -E copy_if_different
-			$<TARGET_FILE:Qt6::Core>
-			$<TARGET_FILE_DIR:dolphin-memory-engine>
-		TARGET dolphin-memory-engine POST_BUILD
-		COMMAND ${CMAKE_COMMAND} -E copy_if_different
-			$<TARGET_FILE:Qt6::Gui>
-			$<TARGET_FILE_DIR:dolphin-memory-engine>
+        TARGET dolphin-memory-engine POST_BUILD
+        COMMAND ${CMAKE_COMMAND} -E copy_if_different
+            $<TARGET_FILE:Qt6::Widgets>
+            $<TARGET_FILE_DIR:dolphin-memory-engine>
+        TARGET dolphin-memory-engine POST_BUILD
+        COMMAND ${CMAKE_COMMAND} -E copy_if_different
+            $<TARGET_FILE:Qt6::Core>
+            $<TARGET_FILE_DIR:dolphin-memory-engine>
+        TARGET dolphin-memory-engine POST_BUILD
+        COMMAND ${CMAKE_COMMAND} -E copy_if_different
+            $<TARGET_FILE:Qt6::Gui>
+            $<TARGET_FILE_DIR:dolphin-memory-engine>
+        TARGET dolphin-memory-engine POST_BUILD
+        COMMAND ${CMAKE_COMMAND} -E copy_if_different
+            $<TARGET_FILE:Qt6::Svg>
+            $<TARGET_FILE_DIR:dolphin-memory-engine>
+        TARGET dolphin-memory-engine POST_BUILD
+        COMMAND ${CMAKE_COMMAND} -E make_directory
+            $<TARGET_FILE_DIR:dolphin-memory-engine>/imageformats
+        TARGET dolphin-memory-engine POST_BUILD
+        COMMAND ${CMAKE_COMMAND} -E copy_if_different
+            $<TARGET_FILE:Qt6::QSvgPlugin>
+            $<TARGET_FILE_DIR:dolphin-memory-engine>/imageformats
         TARGET dolphin-memory-engine POST_BUILD
         COMMAND ${CMAKE_COMMAND} -E make_directory
             $<TARGET_FILE_DIR:dolphin-memory-engine>/platforms
         TARGET dolphin-memory-engine POST_BUILD
         COMMAND ${CMAKE_COMMAND} -E copy_if_different
             $<TARGET_FILE:Qt6::QWindowsIntegrationPlugin>
             $<TARGET_FILE_DIR:dolphin-memory-engine>/platforms
+        TARGET dolphin-memory-engine POST_BUILD
         COMMAND ${CMAKE_COMMAND} -E make_directory
             $<TARGET_FILE_DIR:dolphin-memory-engine>/styles
         TARGET dolphin-memory-engine POST_BUILD
         COMMAND ${CMAKE_COMMAND} -E copy_if_different
             $<TARGET_FILE:Qt6::QWindowsVistaStylePlugin>
             $<TARGET_FILE_DIR:dolphin-memory-engine>/styles
-	)
+    )
 endif(WIN32)
 
 if(APPLE)