Move parts of import_gfx to common.

common/CMakeLists.txt

@@ -284,6 +284,14 @@ set( FONT_SRCS
     font/text_attributes.cpp
 	)
 
+set( COMMON_IMPORT_GFX_SRCS
+    import_gfx/graphics_import_mgr.cpp
+    import_gfx/graphics_importer.cpp
+    import_gfx/graphics_importer_buffer.cpp
+    import_gfx/dxf_import_plugin.cpp
+    import_gfx/svg_import_plugin.cpp
+    )
+
 set( COMMON_SRCS
     ${LIB_KICAD_SRCS}
     ${COMMON_ABOUT_DLG_SRCS}
@@ -296,6 +304,7 @@ set( COMMON_SRCS
     ${PLUGINS_CADSTAR_SRCS}
     ${PLUGINS_EAGLE_SRCS}
 	${FONT_SRCS}
+    ${COMMON_IMPORT_GFX_SRCS}
     jobs/job_dispatcher.cpp
     advanced_config.cpp
     array_axis.cpp
@@ -496,6 +505,9 @@ target_link_libraries( common
     core
     fmt::fmt
     gal
+    nanosvg
+    dxflib_qcad
+    tinyspline_lib
     scripting
     threadpool
     nlohmann_json

pcbnew/CMakeLists.txt

@@ -197,12 +197,7 @@ set( PCBNEW_BRDSTACKUP_MGR
 set( PCBNEW_IMPORT_GFX
     import_gfx/dialog_import_gfx_base.cpp
     import_gfx/dialog_import_gfx.cpp
-    import_gfx/graphics_import_mgr.cpp
-    import_gfx/graphics_importer.cpp
     import_gfx/graphics_importer_pcbnew.cpp
-    import_gfx/graphics_importer_buffer.cpp
-    import_gfx/dxf_import_plugin.cpp
-    import_gfx/svg_import_plugin.cpp
     )
 
 
@@ -628,9 +623,6 @@ target_link_libraries( pcbnew_kiface_objects
     PRIVATE
         common
         core
-        dxflib_qcad
-        nanosvg
-        tinyspline_lib
         nlohmann_json
         rectpack2d
         gzip-hpp
@@ -676,10 +668,7 @@ set( PCBNEW_KIFACE_LIBRARIES
     gal
     scripting
     core
-    dxflib_qcad
-    tinyspline_lib
     idf3
-    nanosvg
     markdown_lib
     ${PCBNEW_IO_LIBRARIES}
     ${wxWidgets_LIBRARIES}

pcbnew/import_gfx/dialog_import_gfx.cpp

@@ -25,6 +25,7 @@
 #include <dialogs/html_message_box.h>
 
 #include "dialog_import_gfx.h"
+#include <import_gfx/dxf_import_plugin.h>
 #include <base_units.h>
 #include <kiface_base.h>
 #include <locale_io.h>
@@ -33,7 +34,6 @@
 #include <bitmaps.h>
 #include <widgets/std_bitmap_button.h>
 #include <map>
-#include "dxf_import_plugin.h"
 #include <wx/filedlg.h>
 #include <wx/msgdlg.h>
 

pcbnew/import_gfx/graphics_importer_pcbnew.h

@@ -27,7 +27,7 @@
 #ifndef GRAPHICS_IMPORTER_PCBNEW_H
 #define GRAPHICS_IMPORTER_PCBNEW_H
 
-#include "graphics_importer.h"
+#include <import_gfx/graphics_importer.h>
 
 #include <layer_ids.h>