From 37edf0e9a6909d0be690ea820aec86c1735f66b6 Mon Sep 17 00:00:00 2001
From: Wayne Stambaugh <stambaughw@gmail.com>
Date: Wed, 27 Mar 2019 19:00:45 -0400
Subject: [PATCH] Remove superfluous build library dependencies.
It looks like someone's paste keys got stuck and added repeated sets of
link libraries in multiple places.
---
cvpcb/CMakeLists.txt | 12 ----------
eeschema/CMakeLists.txt | 18 --------------
gerbview/CMakeLists.txt | 8 +------
pagelayout_editor/CMakeLists.txt | 15 ------------
qa/gal/gal_pixel_alignment/CMakeLists.txt | 29 ++++-------------------
qa/pcb_test_window/CMakeLists.txt | 15 +-----------
qa/pcbnew/CMakeLists.txt | 5 ++--
qa/pcbnew_tools/CMakeLists.txt | 7 +++---
8 files changed, 12 insertions(+), 97 deletions(-)
diff --git a/cvpcb/CMakeLists.txt b/cvpcb/CMakeLists.txt
index 7c8a1b2b6b..1c92bfe422 100644
--- a/cvpcb/CMakeLists.txt
+++ b/cvpcb/CMakeLists.txt
@@ -144,21 +144,9 @@ target_link_libraries( cvpcb_kiface
pcbcommon
pcad2kicadpcb
3d-viewer
- common
gal
legacy_wx
- pcbcommon
- pcad2kicadpcb
- 3d-viewer
common
- gal
- legacy_wx
- pcbcommon
- pcad2kicadpcb
- 3d-viewer
- common
- gal
- legacy_wx
${wxWidgets_LIBRARIES}
${GDI_PLUS_LIBRARIES}
)
diff --git a/eeschema/CMakeLists.txt b/eeschema/CMakeLists.txt
index 09ddf0618c..c521c8f926 100644
--- a/eeschema/CMakeLists.txt
+++ b/eeschema/CMakeLists.txt
@@ -320,18 +320,9 @@ set_source_files_properties( ../common/single_top.cpp PROPERTIES
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.
- common
gal
legacy_gal
common
- gal
- legacy_gal
- common
- gal
- legacy_gal
- common
- gal
- legacy_gal
${wxWidgets_LIBRARIES}
)
@@ -341,18 +332,9 @@ add_library( eeschema_kiface SHARED
${EESCHEMA_COMMON_SRCS}
)
target_link_libraries( eeschema_kiface
- common
gal
legacy_gal
common
- gal
- legacy_gal
- common
- gal
- legacy_gal
- common
- gal
- legacy_gal
${wxWidgets_LIBRARIES}
${GDI_PLUS_LIBRARIES}
)
diff --git a/gerbview/CMakeLists.txt b/gerbview/CMakeLists.txt
index 958eb58d12..4ade4f453f 100644
--- a/gerbview/CMakeLists.txt
+++ b/gerbview/CMakeLists.txt
@@ -117,9 +117,9 @@ set_source_files_properties( ../common/single_top.cpp PROPERTIES
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.
- common
gal
legacy_wx
+ common
${wxWidgets_LIBRARIES}
)
@@ -141,15 +141,9 @@ set_target_properties( gerbview_kiface PROPERTIES
SUFFIX ${KIFACE_SUFFIX}
)
target_link_libraries( gerbview_kiface
- common
gal
legacy_wx
common
- gal
- legacy_wx
- common
- gal
- legacy_wx
${wxWidgets_LIBRARIES}
${GDI_PLUS_LIBRARIES}
)
diff --git a/pagelayout_editor/CMakeLists.txt b/pagelayout_editor/CMakeLists.txt
index 366eb9117a..67d321c4e7 100644
--- a/pagelayout_editor/CMakeLists.txt
+++ b/pagelayout_editor/CMakeLists.txt
@@ -80,18 +80,9 @@ 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.
- common
- gal
legacy_wx
- common
gal
- legacy_wx
common
- gal
- legacy_wx
- common
- gal
- legacy_wx
${wxWidgets_LIBRARIES}
)
@@ -108,15 +99,9 @@ add_library( pl_editor_kiface MODULE
${PL_EDITOR_EXTRA_SRCS}
)
target_link_libraries( pl_editor_kiface
- common
- gal
legacy_wx
- common
gal
- legacy_wx
common
- gal
- legacy_wx
${wxWidgets_LIBRARIES}
${GDI_PLUS_LIBRARIES}
)
diff --git a/qa/gal/gal_pixel_alignment/CMakeLists.txt b/qa/gal/gal_pixel_alignment/CMakeLists.txt
index f843de5c9f..dcf1d27c85 100644
--- a/qa/gal/gal_pixel_alignment/CMakeLists.txt
+++ b/qa/gal/gal_pixel_alignment/CMakeLists.txt
@@ -63,36 +63,17 @@ include_directories(
)
target_link_libraries( test_gal_pixel_alignment
+ qa_pcbnew_utils
polygon
pnsrouter
- common
pcbcommon
- bitmaps
- polygon
- pnsrouter
- common
- pcbcommon
- bitmaps
- polygon
- pnsrouter
- common
- pcbcommon
- legacy_gal
- bitmaps
- polygon
- pnsrouter
- common
- pcbcommon
- 3d-viewer
- bitmaps
- gal
pcad2kicadpcb
- common
- pcbcommon
+ bitmaps
+ 3d-viewer
+ gal
legacy_gal
- ${GITHUB_PLUGIN_LIBRARIES}
common
- pcbcommon
+ ${GITHUB_PLUGIN_LIBRARIES}
${Boost_FILESYSTEM_LIBRARY}
${Boost_SYSTEM_LIBRARY}
${Boost_UNIT_TEST_FRAMEWORK_LIBRARY}
diff --git a/qa/pcb_test_window/CMakeLists.txt b/qa/pcb_test_window/CMakeLists.txt
index e1ab06d4ce..e34ad26311 100644
--- a/qa/pcb_test_window/CMakeLists.txt
+++ b/qa/pcb_test_window/CMakeLists.txt
@@ -62,26 +62,13 @@ include_directories(
)
target_link_libraries( test_window
+ pcad2kicadpcb
pnsrouter
- common
- pcbcommon
- pnsrouter
- common
- pcbcommon
- pnsrouter
- common
- pcbcommon
- pnsrouter
- common
pcbcommon
3d-viewer
gal
- pcad2kicadpcb
common
- pcbcommon
${GITHUB_PLUGIN_LIBRARIES}
- common
- pcbcommon
${Boost_FILESYSTEM_LIBRARY}
${Boost_SYSTEM_LIBRARY}
${Boost_UNIT_TEST_FRAMEWORK_LIBRARY}
diff --git a/qa/pcbnew/CMakeLists.txt b/qa/pcbnew/CMakeLists.txt
index e194cd650c..2ef779f1e6 100644
--- a/qa/pcbnew/CMakeLists.txt
+++ b/qa/pcbnew/CMakeLists.txt
@@ -61,10 +61,9 @@ target_link_libraries( qa_pcbnew
pcbcommon
pnsrouter
pcad2kicadpcb
- common
- pcbcommon
legacy_wx
gal
+ common
qa_utils
lib_dxf
idf3
@@ -79,4 +78,4 @@ target_link_libraries( qa_pcbnew
add_test( NAME pcbnew
COMMAND qa_pcbnew
-)
\ No newline at end of file
+)
diff --git a/qa/pcbnew_tools/CMakeLists.txt b/qa/pcbnew_tools/CMakeLists.txt
index 76934655c5..6dfa54f7f9 100644
--- a/qa/pcbnew_tools/CMakeLists.txt
+++ b/qa/pcbnew_tools/CMakeLists.txt
@@ -49,13 +49,12 @@ target_link_libraries( qa_pcbnew_tools
pcbcommon
pnsrouter
pcad2kicadpcb
- common
- pcbcommon
legacy_wx
gal
- qa_utils
lib_dxf
idf3
+ common
+ qa_utils
unit_test_utils
${wxWidgets_LIBRARIES}
${GITHUB_PLUGIN_LIBRARIES}
@@ -63,4 +62,4 @@ target_link_libraries( qa_pcbnew_tools
${PYTHON_LIBRARIES}
${Boost_LIBRARIES} # must follow GITHUB
${PCBNEW_EXTRA_LIBS} # -lrt must follow Boost
-)
\ No newline at end of file
+)