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

Remove superfluous build library dependencies. 

It looks like someone's paste keys got stuck and added repeated sets of
link libraries in multiple places.
This commit is contained in:
Wayne Stambaugh 2019-03-27 19:00:45 -04:00
parent 49d75e2383
commit 37edf0e9a6
8 changed files with 12 additions and 97 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
cvpcb/CMakeLists.txt
View File

@ -144,21 +144,9 @@ target_link_libraries( cvpcb_kiface
pcbcommon pcbcommon
pcad2kicadpcb pcad2kicadpcb
3d-viewer 3d-viewer
common
gal gal
legacy_wx legacy_wx
pcbcommon
pcad2kicadpcb
3d-viewer
common common
gal
legacy_wx
pcbcommon
pcad2kicadpcb
3d-viewer
common
gal
legacy_wx
${wxWidgets_LIBRARIES} ${wxWidgets_LIBRARIES}
${GDI_PLUS_LIBRARIES} ${GDI_PLUS_LIBRARIES}
) )

18
eeschema/CMakeLists.txt
View File

@ -320,18 +320,9 @@ set_source_files_properties( ../common/single_top.cpp PROPERTIES
target_link_libraries( eeschema 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.
common
gal gal
legacy_gal legacy_gal
common common
gal
legacy_gal
common
gal
legacy_gal
common
gal
legacy_gal
${wxWidgets_LIBRARIES} ${wxWidgets_LIBRARIES}
) )
@ -341,18 +332,9 @@ add_library( eeschema_kiface SHARED
${EESCHEMA_COMMON_SRCS} ${EESCHEMA_COMMON_SRCS}
) )
target_link_libraries( eeschema_kiface target_link_libraries( eeschema_kiface
common
gal gal
legacy_gal legacy_gal
common common
gal
legacy_gal
common
gal
legacy_gal
common
gal
legacy_gal
${wxWidgets_LIBRARIES} ${wxWidgets_LIBRARIES}
${GDI_PLUS_LIBRARIES} ${GDI_PLUS_LIBRARIES}
) )

8
gerbview/CMakeLists.txt
View File

@ -117,9 +117,9 @@ set_source_files_properties( ../common/single_top.cpp PROPERTIES
target_link_libraries( gerbview 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.
common
gal gal
legacy_wx legacy_wx
common
${wxWidgets_LIBRARIES} ${wxWidgets_LIBRARIES}
) )
@ -141,15 +141,9 @@ set_target_properties( gerbview_kiface PROPERTIES
SUFFIX ${KIFACE_SUFFIX} SUFFIX ${KIFACE_SUFFIX}
) )
target_link_libraries( gerbview_kiface target_link_libraries( gerbview_kiface
common
gal gal
legacy_wx legacy_wx
common common
gal
legacy_wx
common
gal
legacy_wx
${wxWidgets_LIBRARIES} ${wxWidgets_LIBRARIES}
${GDI_PLUS_LIBRARIES} ${GDI_PLUS_LIBRARIES}
) )

15
pagelayout_editor/CMakeLists.txt
View File

@ -80,18 +80,9 @@ 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.
common
gal
legacy_wx legacy_wx
common
gal gal
legacy_wx
common common
gal
legacy_wx
common
gal
legacy_wx
${wxWidgets_LIBRARIES} ${wxWidgets_LIBRARIES}
) )
@ -108,15 +99,9 @@ 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
common
gal
legacy_wx legacy_wx
common
gal gal
legacy_wx
common common
gal
legacy_wx
${wxWidgets_LIBRARIES} ${wxWidgets_LIBRARIES}
${GDI_PLUS_LIBRARIES} ${GDI_PLUS_LIBRARIES}
) )

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

@ -63,36 +63,17 @@ include_directories(
) )
target_link_libraries( test_gal_pixel_alignment target_link_libraries( test_gal_pixel_alignment
qa_pcbnew_utils
polygon polygon
pnsrouter pnsrouter
common
pcbcommon pcbcommon
bitmaps
polygon
pnsrouter
common
pcbcommon
bitmaps
polygon
pnsrouter
common
pcbcommon
legacy_gal
bitmaps
polygon
pnsrouter
common
pcbcommon
3d-viewer
bitmaps
gal
pcad2kicadpcb pcad2kicadpcb
common bitmaps
pcbcommon 3d-viewer
gal
legacy_gal legacy_gal
${GITHUB_PLUGIN_LIBRARIES}
common common
pcbcommon ${GITHUB_PLUGIN_LIBRARIES}
${Boost_FILESYSTEM_LIBRARY} ${Boost_FILESYSTEM_LIBRARY}
${Boost_SYSTEM_LIBRARY} ${Boost_SYSTEM_LIBRARY}
${Boost_UNIT_TEST_FRAMEWORK_LIBRARY} ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY}

15
qa/pcb_test_window/CMakeLists.txt
View File

@ -62,26 +62,13 @@ include_directories(
) )
target_link_libraries( test_window target_link_libraries( test_window
pcad2kicadpcb
pnsrouter pnsrouter
common
pcbcommon
pnsrouter
common
pcbcommon
pnsrouter
common
pcbcommon
pnsrouter
common
pcbcommon pcbcommon
3d-viewer 3d-viewer
gal gal
pcad2kicadpcb
common common
pcbcommon
${GITHUB_PLUGIN_LIBRARIES} ${GITHUB_PLUGIN_LIBRARIES}
common
pcbcommon
${Boost_FILESYSTEM_LIBRARY} ${Boost_FILESYSTEM_LIBRARY}
${Boost_SYSTEM_LIBRARY} ${Boost_SYSTEM_LIBRARY}
${Boost_UNIT_TEST_FRAMEWORK_LIBRARY} ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY}

5
qa/pcbnew/CMakeLists.txt
View File

@ -61,10 +61,9 @@ target_link_libraries( qa_pcbnew
pcbcommon pcbcommon
pnsrouter pnsrouter
pcad2kicadpcb pcad2kicadpcb
common
pcbcommon
legacy_wx legacy_wx
gal gal
common
qa_utils qa_utils
lib_dxf lib_dxf
idf3 idf3
@ -79,4 +78,4 @@ target_link_libraries( qa_pcbnew
add_test( NAME pcbnew add_test( NAME pcbnew
COMMAND qa_pcbnew COMMAND qa_pcbnew
) )

7
qa/pcbnew_tools/CMakeLists.txt
View File

@ -49,13 +49,12 @@ target_link_libraries( qa_pcbnew_tools
pcbcommon pcbcommon
pnsrouter pnsrouter
pcad2kicadpcb pcad2kicadpcb
common
pcbcommon
legacy_wx legacy_wx
gal gal
qa_utils
lib_dxf lib_dxf
idf3 idf3
common
qa_utils
unit_test_utils unit_test_utils
${wxWidgets_LIBRARIES} ${wxWidgets_LIBRARIES}
${GITHUB_PLUGIN_LIBRARIES} ${GITHUB_PLUGIN_LIBRARIES}
@ -63,4 +62,4 @@ target_link_libraries( qa_pcbnew_tools
${PYTHON_LIBRARIES} ${PYTHON_LIBRARIES}
${Boost_LIBRARIES} # must follow GITHUB ${Boost_LIBRARIES} # must follow GITHUB
${PCBNEW_EXTRA_LIBS} # -lrt must follow Boost ${PCBNEW_EXTRA_LIBS} # -lrt must follow Boost
) )