haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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.
This commit is contained in:
John Beard 2019-06-10 13:05:59 +01:00
parent beb4348016
commit 7ebda0247f
13 changed files with 1 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
common/CMakeLists.txt
View File

@ -70,16 +70,7 @@ set( GAL_SRCS
gal/cairo/cairo_print.cpp gal/cairo/cairo_print.cpp
) )
set( LEGACY_GAL_SRCS
legacy_gal/eda_draw_frame.cpp
)
add_library( gal STATIC ${GAL_SRCS} ) 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 target_link_libraries( gal
polygon polygon
@ -295,6 +286,7 @@ set( COMMON_SRCS
eda_dde.cpp eda_dde.cpp
eda_doc.cpp eda_doc.cpp
eda_dockart.cpp eda_dockart.cpp
eda_draw_frame.cpp
eda_pattern_match.cpp eda_pattern_match.cpp
eda_size_ctrl.cpp eda_size_ctrl.cpp
env_paths.cpp env_paths.cpp

0
common/legacy_gal/eda_draw_frame.cpp → common/eda_draw_frame.cpp
View File

1
cvpcb/CMakeLists.txt
View File

@ -143,7 +143,6 @@ target_link_libraries( cvpcb_kiface
pcad2kicadpcb pcad2kicadpcb
3d-viewer 3d-viewer
gal gal
legacy_gal
common common
${wxWidgets_LIBRARIES} ${wxWidgets_LIBRARIES}
${GDI_PLUS_LIBRARIES} ${GDI_PLUS_LIBRARIES}

3
eeschema/CMakeLists.txt
View File

@ -324,7 +324,6 @@ target_link_libraries( eeschema
#singletop # replaces common, giving us restrictive control and link warnings. #singletop # replaces common, giving us restrictive control and link warnings.
# There's way too much crap coming in from common yet. # There's way too much crap coming in from common yet.
gal gal
legacy_gal
common common
${wxWidgets_LIBRARIES} ${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 # but we only need include directories, as we will link the kiface MODULE
target_include_directories( eeschema_kiface_objects PRIVATE target_include_directories( eeschema_kiface_objects PRIVATE
$<TARGET_PROPERTY:common,INCLUDE_DIRECTORIES> $<TARGET_PROPERTY:common,INCLUDE_DIRECTORIES>
$<TARGET_PROPERTY:legacy_gal,INCLUDE_DIRECTORIES>
) )
add_library( eeschema_kiface MODULE add_library( eeschema_kiface MODULE
@ -348,7 +346,6 @@ add_library( eeschema_kiface MODULE
) )
target_link_libraries( eeschema_kiface target_link_libraries( eeschema_kiface
legacy_gal
common common
${wxWidgets_LIBRARIES} ${wxWidgets_LIBRARIES}
${GDI_PLUS_LIBRARIES} ${GDI_PLUS_LIBRARIES}

2
gerbview/CMakeLists.txt
View File

@ -112,7 +112,6 @@ target_link_libraries( gerbview
#singletop # replaces common, giving us restrictive control and link warnings. #singletop # replaces common, giving us restrictive control and link warnings.
# There's way too much crap coming in from common yet. # There's way too much crap coming in from common yet.
gal gal
legacy_gal
common common
${wxWidgets_LIBRARIES} ${wxWidgets_LIBRARIES}
) )
@ -136,7 +135,6 @@ set_target_properties( gerbview_kiface PROPERTIES
) )
target_link_libraries( gerbview_kiface target_link_libraries( gerbview_kiface
gal gal
legacy_gal
common common
${wxWidgets_LIBRARIES} ${wxWidgets_LIBRARIES}
${GDI_PLUS_LIBRARIES} ${GDI_PLUS_LIBRARIES}

2
pagelayout_editor/CMakeLists.txt
View File

@ -80,7 +80,6 @@ set_source_files_properties( ../common/single_top.cpp PROPERTIES
target_link_libraries( pl_editor target_link_libraries( pl_editor
#singletop # replaces common, giving us restrictive control and link warnings. #singletop # replaces common, giving us restrictive control and link warnings.
# There's way too much crap coming in from common yet. # There's way too much crap coming in from common yet.
legacy_gal
gal gal
common common
${wxWidgets_LIBRARIES} ${wxWidgets_LIBRARIES}
@ -99,7 +98,6 @@ add_library( pl_editor_kiface MODULE
${PL_EDITOR_EXTRA_SRCS} ${PL_EDITOR_EXTRA_SRCS}
) )
target_link_libraries( pl_editor_kiface target_link_libraries( pl_editor_kiface
legacy_gal
gal gal
common common
${wxWidgets_LIBRARIES} ${wxWidgets_LIBRARIES}

1
pcbnew/CMakeLists.txt
View File

@ -636,7 +636,6 @@ set( PCBNEW_KIFACE_LIBRARIES
pcbcommon pcbcommon
pnsrouter pnsrouter
pcad2kicadpcb pcad2kicadpcb
legacy_gal
common common
gal gal
lib_dxf lib_dxf

1
qa/common/CMakeLists.txt
View File

@ -67,7 +67,6 @@ set( common_srcs
set( common_libs set( common_libs
common common
legacy_gal
gal gal
qa_utils qa_utils
unit_test_utils unit_test_utils

1
qa/common_tools/CMakeLists.txt
View File

@ -48,7 +48,6 @@ include_directories(
target_link_libraries( qa_common_tools target_link_libraries( qa_common_tools
common common
legacy_gal
gal gal
qa_utils qa_utils
sexpr sexpr

1
qa/eeschema/CMakeLists.txt
View File

@ -54,7 +54,6 @@ add_executable( qa_eeschema
target_link_libraries( qa_eeschema target_link_libraries( qa_eeschema
common common
legacy_gal
qa_utils qa_utils
unit_test_utils unit_test_utils
${GDI_PLUS_LIBRARIES} ${GDI_PLUS_LIBRARIES}

1
qa/gal/gal_pixel_alignment/CMakeLists.txt
View File

@ -71,7 +71,6 @@ target_link_libraries( test_gal_pixel_alignment
bitmaps bitmaps
3d-viewer 3d-viewer
gal gal
legacy_gal
common common
${GITHUB_PLUGIN_LIBRARIES} ${GITHUB_PLUGIN_LIBRARIES}
${Boost_FILESYSTEM_LIBRARY} ${Boost_FILESYSTEM_LIBRARY}

1
qa/pcbnew/CMakeLists.txt
View File

@ -61,7 +61,6 @@ target_link_libraries( qa_pcbnew
pcbcommon pcbcommon
pnsrouter pnsrouter
pcad2kicadpcb pcad2kicadpcb
legacy_gal
gal gal
common common
gal gal

1
qa/pcbnew_tools/CMakeLists.txt
View File

@ -49,7 +49,6 @@ target_link_libraries( qa_pcbnew_tools
pcbcommon pcbcommon
pnsrouter pnsrouter
pcad2kicadpcb pcad2kicadpcb
legacy_gal
gal gal
lib_dxf lib_dxf
idf3 idf3