From 2a3b597ab9b7fa88f1f97e87eb7073d8349c6408 Mon Sep 17 00:00:00 2001
From: Marek Roszko <mark.roszko@gmail.com>
Date: Sun, 14 Apr 2024 07:48:09 -0400
Subject: [PATCH] Strip out no longer needed links on the top executables

Not needed due to kicommon
---
 bitmap2component/CMakeLists.txt  |  1 +
 common/CMakeLists.txt            | 12 ------------
 eeschema/CMakeLists.txt          |  7 +------
 gerbview/CMakeLists.txt          |  4 ----
 pagelayout_editor/CMakeLists.txt |  5 -----
 pcb_calculator/CMakeLists.txt    |  3 ---
 pcbnew/CMakeLists.txt            | 10 +---------
 7 files changed, 3 insertions(+), 39 deletions(-)

diff --git a/bitmap2component/CMakeLists.txt b/bitmap2component/CMakeLists.txt
index 4c33940d45..40d927dfd9 100644
--- a/bitmap2component/CMakeLists.txt
+++ b/bitmap2component/CMakeLists.txt
@@ -52,6 +52,7 @@ add_executable( bitmap2component WIN32 MACOSX_BUNDLE
 
 target_link_libraries( bitmap2component
     common
+    kicommon
     ${wxWidgets_LIBRARIES}
     potrace
     )
diff --git a/common/CMakeLists.txt b/common/CMakeLists.txt
index 6bc36acb42..cb88e164f0 100644
--- a/common/CMakeLists.txt
+++ b/common/CMakeLists.txt
@@ -46,18 +46,6 @@ add_custom_target(
     COMMENT "Generating version string header"
     )
 
-# A shared library subsetted from common which restricts what can go into
-# a single_top link image.  By not linking to common, we control what does
-# statically go into single_top link images.  My current thinking is that only
-# wxWidgets should be a shared link from single top, everything else should be
-# statically bound into it. Otherwise you will have DSO loading probs. After it
-# sets the LIB PATHS however, we want the *.kiface modules to use shared linking.
-add_library( singletop STATIC EXCLUDE_FROM_ALL
-    eda_doc.cpp
-    kiway.cpp
-    kiway_holder.cpp )
-
-
 # A shared library used by multiple *.kiface files and one or two program
 # launchers.  Object files can migrate into here over time, but only if they are
 # surely needed and certainly used from more than one place without recompilation.
diff --git a/eeschema/CMakeLists.txt b/eeschema/CMakeLists.txt
index b7d6773ad8..d94e38d9fc 100644
--- a/eeschema/CMakeLists.txt
+++ b/eeschema/CMakeLists.txt
@@ -550,13 +550,8 @@ add_executable( eeschema WIN32 MACOSX_BUNDLE
 set_source_files_properties( ${CMAKE_SOURCE_DIR}/common/single_top.cpp PROPERTIES
     COMPILE_DEFINITIONS "TOP_FRAME=FRAME_SCH;PGM_DATA_FILE_EXT=\"kicad_sch\";BUILD_KIWAY_DLL"
     )
+
 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
-    common
-    pcbcommon
-    argparse::argparse
     kicommon
     ${wxWidgets_LIBRARIES}
     )
diff --git a/gerbview/CMakeLists.txt b/gerbview/CMakeLists.txt
index f3e6b5ec3f..06e735a1d8 100644
--- a/gerbview/CMakeLists.txt
+++ b/gerbview/CMakeLists.txt
@@ -110,10 +110,6 @@ set_source_files_properties( ${CMAKE_SOURCE_DIR}/common/single_top.cpp PROPERTIE
     COMPILE_DEFINITIONS "TOP_FRAME=FRAME_GERBER;BUILD_KIWAY_DLL"
     )
 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
-    common
     core
     kicommon
     nlohmann_json
diff --git a/pagelayout_editor/CMakeLists.txt b/pagelayout_editor/CMakeLists.txt
index 3003c132d2..527aed4e76 100644
--- a/pagelayout_editor/CMakeLists.txt
+++ b/pagelayout_editor/CMakeLists.txt
@@ -81,11 +81,6 @@ set_source_files_properties( ${CMAKE_SOURCE_DIR}/common/single_top.cpp PROPERTIE
     COMPILE_DEFINITIONS "TOP_FRAME=FRAME_PL_EDITOR;PGM_DATA_FILE_EXT=\"kicad_wks\";BUILD_KIWAY_DLL"
     )
 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.
-    gal
-    common
-    core
     kicommon
     ${wxWidgets_LIBRARIES}
     )
diff --git a/pcb_calculator/CMakeLists.txt b/pcb_calculator/CMakeLists.txt
index b019eefc00..8fcf58e46c 100644
--- a/pcb_calculator/CMakeLists.txt
+++ b/pcb_calculator/CMakeLists.txt
@@ -95,9 +95,6 @@ set_source_files_properties( ${CMAKE_SOURCE_DIR}/common/single_top.cpp PROPERTIE
     COMPILE_DEFINITIONS "TOP_FRAME=FRAME_CALC;BUILD_KIWAY_DLL"
     )
 target_link_libraries( pcb_calculator
-    #singletop  # replaces common, giving us restrictive control and link warnings.
-    # There's way too much crap coming in from common yet.
-    common
     kicommon
     ${wxWidgets_LIBRARIES}
     )
diff --git a/pcbnew/CMakeLists.txt b/pcbnew/CMakeLists.txt
index dde42117a7..5542382679 100644
--- a/pcbnew/CMakeLists.txt
+++ b/pcbnew/CMakeLists.txt
@@ -638,15 +638,7 @@ set_source_files_properties( ${CMAKE_SOURCE_DIR}/common/single_top.cpp pcbnew.cp
     COMPILE_DEFINITIONS "TOP_FRAME=FRAME_PCB_EDITOR;PGM_DATA_FILE_EXT=\"kicad_pcb\";BUILD_KIWAY_DLL"
     )
 target_link_libraries( pcbnew
-    #singletop  # replaces common, giving us restrictive control and link warnings.
-    # There's way too much crap coming in from common yet.
-    common
-    gal
-    scripting
-    core
-    nlohmann_json
-    rectpack2d
-    argparse::argparse
+    kicommon
     ${wxWidgets_LIBRARIES}
     )