From 7ebda0247fba3c14d518cbbc8bfcabb07e4a793a Mon Sep 17 00:00:00 2001 From: John Beard Date: Mon, 10 Jun 2019 13:05:59 +0100 Subject: [PATCH] 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. --- common/CMakeLists.txt | 10 +--------- common/{legacy_gal => }/eda_draw_frame.cpp | 0 cvpcb/CMakeLists.txt | 1 - eeschema/CMakeLists.txt | 3 --- gerbview/CMakeLists.txt | 2 -- pagelayout_editor/CMakeLists.txt | 2 -- pcbnew/CMakeLists.txt | 1 - qa/common/CMakeLists.txt | 1 - qa/common_tools/CMakeLists.txt | 1 - qa/eeschema/CMakeLists.txt | 1 - qa/gal/gal_pixel_alignment/CMakeLists.txt | 1 - qa/pcbnew/CMakeLists.txt | 1 - qa/pcbnew_tools/CMakeLists.txt | 1 - 13 files changed, 1 insertion(+), 24 deletions(-) rename common/{legacy_gal => }/eda_draw_frame.cpp (100%) diff --git a/common/CMakeLists.txt b/common/CMakeLists.txt index 1905826334..19051b5f58 100644 --- 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 diff --git a/common/legacy_gal/eda_draw_frame.cpp b/common/eda_draw_frame.cpp similarity index 100% rename from common/legacy_gal/eda_draw_frame.cpp rename to common/eda_draw_frame.cpp diff --git a/cvpcb/CMakeLists.txt b/cvpcb/CMakeLists.txt index 5d0bded503..88e91fa4d8 100644 --- 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} diff --git a/eeschema/CMakeLists.txt b/eeschema/CMakeLists.txt index 0c1e6d5c30..9ad830681a 100644 --- 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 $ - $ ) 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} diff --git a/gerbview/CMakeLists.txt b/gerbview/CMakeLists.txt index 006116fe96..f02512edad 100644 --- 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} diff --git a/pagelayout_editor/CMakeLists.txt b/pagelayout_editor/CMakeLists.txt index e5647b7140..f18fe28dc5 100644 --- 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} diff --git a/pcbnew/CMakeLists.txt b/pcbnew/CMakeLists.txt index 37184ab8ea..967e70d7f7 100644 --- 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 diff --git a/qa/common/CMakeLists.txt b/qa/common/CMakeLists.txt index 61816ff360..68bda9fe12 100644 --- 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 diff --git a/qa/common_tools/CMakeLists.txt b/qa/common_tools/CMakeLists.txt index 0d5425a2d1..959eb77447 100644 --- 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 diff --git a/qa/eeschema/CMakeLists.txt b/qa/eeschema/CMakeLists.txt index ae411de6bf..fbdf4d9984 100644 --- 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} diff --git a/qa/gal/gal_pixel_alignment/CMakeLists.txt b/qa/gal/gal_pixel_alignment/CMakeLists.txt index 5e0c80f650..c3d4d32a3e 100644 --- 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} diff --git a/qa/pcbnew/CMakeLists.txt b/qa/pcbnew/CMakeLists.txt index b5f4260f20..88eabf5888 100644 --- 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 diff --git a/qa/pcbnew_tools/CMakeLists.txt b/qa/pcbnew_tools/CMakeLists.txt index e46cb8551d..ea54ac06c5 100644 --- 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