Common: Remove legacy_gal library, fold into common

Return the EDA_DRAW_FRAME class back to common, whence it came (before it was duplicated into legacy_wx and legacy_gal). Now there is only one implementation (the GAL one), it doesn't need to be in a separate library. This simplifies the dependencies for common lib users.
6 years ago · 7ebda0247f
13 changed files with 1 additions and 24 deletions
--- a/common/CMakeLists.txt
+++ b/common/CMakeLists.txt
@ -70,16 +70,7 @@ set( GAL_SRCS
    gal/cairo/cairo_print.cpp
    )

-set( LEGACY_GAL_SRCS
-    legacy_gal/eda_draw_frame.cpp
-    )
-
 add_library( gal STATIC ${GAL_SRCS} )
-add_library( legacy_gal STATIC ${LEGACY_GAL_SRCS} )
-
-target_include_directories( legacy_gal PUBLIC ../include/legacy_gal )
-
-target_link_libraries( legacy_gal PRIVATE bitmaps polygon )

 target_link_libraries( gal
    polygon
@ -295,6 +286,7 @@ set( COMMON_SRCS
    eda_dde.cpp
    eda_doc.cpp
    eda_dockart.cpp
+    eda_draw_frame.cpp
    eda_pattern_match.cpp
    eda_size_ctrl.cpp
    env_paths.cpp
--- a/common/legacy_gal/eda_draw_frame.cpp
+++ b/common/legacy_gal/eda_draw_frame.cpp
--- a/cvpcb/CMakeLists.txt
+++ b/cvpcb/CMakeLists.txt
@ -143,7 +143,6 @@ target_link_libraries( cvpcb_kiface
    pcad2kicadpcb
    3d-viewer
    gal
-    legacy_gal
    common
    ${wxWidgets_LIBRARIES}
    ${GDI_PLUS_LIBRARIES}
--- a/eeschema/CMakeLists.txt
+++ b/eeschema/CMakeLists.txt
@ -324,7 +324,6 @@ target_link_libraries( eeschema
    #singletop  # replaces common, giving us restrictive control and link warnings.
    # There's way too much crap coming in from common yet.
    gal
-    legacy_gal
    common
    ${wxWidgets_LIBRARIES}
    )
@ -339,7 +338,6 @@ add_library( eeschema_kiface_objects OBJECT
 # but we only need include directories, as we will link the kiface MODULE
 target_include_directories( eeschema_kiface_objects PRIVATE
   $<TARGET_PROPERTY:common,INCLUDE_DIRECTORIES>
-   $<TARGET_PROPERTY:legacy_gal,INCLUDE_DIRECTORIES>
 )

 add_library( eeschema_kiface MODULE
@ -348,7 +346,6 @@ add_library( eeschema_kiface MODULE
    )

 target_link_libraries( eeschema_kiface
-    legacy_gal
    common
    ${wxWidgets_LIBRARIES}
    ${GDI_PLUS_LIBRARIES}
--- a/gerbview/CMakeLists.txt
+++ b/gerbview/CMakeLists.txt
@ -112,7 +112,6 @@ target_link_libraries( gerbview
    #singletop  # replaces common, giving us restrictive control and link warnings.
    # There's way too much crap coming in from common yet.
    gal
-    legacy_gal
    common
    ${wxWidgets_LIBRARIES}
    )
@ -136,7 +135,6 @@ set_target_properties( gerbview_kiface PROPERTIES
    )
 target_link_libraries( gerbview_kiface
    gal
-    legacy_gal
    common
    ${wxWidgets_LIBRARIES}
    ${GDI_PLUS_LIBRARIES}
--- a/pagelayout_editor/CMakeLists.txt
+++ b/pagelayout_editor/CMakeLists.txt
@ -80,7 +80,6 @@ set_source_files_properties( ../common/single_top.cpp PROPERTIES
 target_link_libraries( pl_editor
    #singletop  # replaces common, giving us restrictive control and link warnings.
    # There's way too much crap coming in from common yet.
-    legacy_gal
    gal
    common
    ${wxWidgets_LIBRARIES}
@ -99,7 +98,6 @@ add_library( pl_editor_kiface MODULE
    ${PL_EDITOR_EXTRA_SRCS}
    )
 target_link_libraries( pl_editor_kiface
-    legacy_gal
    gal
    common
    ${wxWidgets_LIBRARIES}
--- a/pcbnew/CMakeLists.txt
+++ b/pcbnew/CMakeLists.txt
@ -636,7 +636,6 @@ set( PCBNEW_KIFACE_LIBRARIES
    pcbcommon
    pnsrouter
    pcad2kicadpcb
-    legacy_gal
    common
    gal
    lib_dxf
--- a/qa/common/CMakeLists.txt
+++ b/qa/common/CMakeLists.txt
@ -67,7 +67,6 @@ set( common_srcs

 set( common_libs
    common
-    legacy_gal
    gal
    qa_utils
    unit_test_utils
--- a/qa/common_tools/CMakeLists.txt
+++ b/qa/common_tools/CMakeLists.txt
@ -48,7 +48,6 @@ include_directories(

 target_link_libraries( qa_common_tools
    common
-    legacy_gal
    gal
    qa_utils
    sexpr
--- a/qa/eeschema/CMakeLists.txt
+++ b/qa/eeschema/CMakeLists.txt
@ -54,7 +54,6 @@ add_executable( qa_eeschema

 target_link_libraries( qa_eeschema
    common
-    legacy_gal
    qa_utils
    unit_test_utils
    ${GDI_PLUS_LIBRARIES}
--- a/qa/gal/gal_pixel_alignment/CMakeLists.txt
+++ b/qa/gal/gal_pixel_alignment/CMakeLists.txt
@ -71,7 +71,6 @@ target_link_libraries( test_gal_pixel_alignment
    bitmaps
    3d-viewer
    gal
-    legacy_gal
    common
    ${GITHUB_PLUGIN_LIBRARIES}
    ${Boost_FILESYSTEM_LIBRARY}
--- a/qa/pcbnew/CMakeLists.txt
+++ b/qa/pcbnew/CMakeLists.txt
@ -61,7 +61,6 @@ target_link_libraries( qa_pcbnew
    pcbcommon
    pnsrouter
    pcad2kicadpcb
-    legacy_gal
    gal
    common
    gal
--- a/qa/pcbnew_tools/CMakeLists.txt
+++ b/qa/pcbnew_tools/CMakeLists.txt
@ -49,7 +49,6 @@ target_link_libraries( qa_pcbnew_tools
    pcbcommon
    pnsrouter
    pcad2kicadpcb
-    legacy_gal
    gal
    lib_dxf
    idf3