diff --git a/3d-viewer/CMakeLists.txt b/3d-viewer/CMakeLists.txt
index 8e36d4f805..4070375104 100644
--- a/3d-viewer/CMakeLists.txt
+++ b/3d-viewer/CMakeLists.txt
@@ -114,6 +114,7 @@ target_link_libraries( 3d-viewer
PRIVATE
gal
kimath
+ core
nlohmann_json
Boost::headers
${wxWidgets_LIBRARIES}
diff --git a/common/CMakeLists.txt b/common/CMakeLists.txt
index 7744b5267c..9f69db8a7b 100644
--- a/common/CMakeLists.txt
+++ b/common/CMakeLists.txt
@@ -483,6 +483,7 @@ target_link_libraries( common
libcontext
kimath
kiplatform
+ core
fmt::fmt
gal
scripting
@@ -618,6 +619,7 @@ target_link_libraries( pcbcommon PUBLIC
delaunator
kimath
kiplatform
+ core
threadpool
)
diff --git a/eeschema/CMakeLists.txt b/eeschema/CMakeLists.txt
index e764c1ab13..39abaa286c 100644
--- a/eeschema/CMakeLists.txt
+++ b/eeschema/CMakeLists.txt
@@ -483,6 +483,7 @@ target_link_libraries( eeschema_kiface
markdown_lib
scripting
sexpr
+ core
Boost::headers
${wxWidgets_LIBRARIES}
${NGSPICE_LIBRARY}
diff --git a/gerbview/CMakeLists.txt b/gerbview/CMakeLists.txt
index 0ba674ff61..6a6a588c60 100644
--- a/gerbview/CMakeLists.txt
+++ b/gerbview/CMakeLists.txt
@@ -112,6 +112,7 @@ target_link_libraries( gerbview
# There's way too much crap coming in from common yet.
gal
common
+ core
nlohmann_json
${wxWidgets_LIBRARIES}
)
@@ -137,6 +138,7 @@ target_link_libraries( gerbview_kiface_objects
PUBLIC
common
gal
+ core
)
# the main gerbview program, in DSO form.
@@ -153,6 +155,7 @@ target_link_libraries( gerbview_kiface
nlohmann_json
gal
common
+ core
gerbview_kiface_objects
${wxWidgets_LIBRARIES}
)
diff --git a/kicad/CMakeLists.txt b/kicad/CMakeLists.txt
index 6879ffd0f1..5d6071990f 100644
--- a/kicad/CMakeLists.txt
+++ b/kicad/CMakeLists.txt
@@ -118,6 +118,7 @@ if( APPLE )
target_link_libraries( kicad
nlohmann_json
common
+ core
${wxWidgets_LIBRARIES}
)
@@ -129,6 +130,7 @@ if( APPLE )
nlohmann_json
common
${wxWidgets_LIBRARIES}
+ core
)
else()
target_link_libraries( kicad
@@ -136,6 +138,7 @@ else()
common
gal
common #repeated due to a circular dependency between gal and common
+ core
${wxWidgets_LIBRARIES}
)
@@ -144,6 +147,7 @@ else()
common
gal
common #repeated due to a circular dependency between gal and common
+ core
${wxWidgets_LIBRARIES}
)
endif()
diff --git a/kicad/pcm/CMakeLists.txt b/kicad/pcm/CMakeLists.txt
index 402bb57f35..96dbaf5b74 100644
--- a/kicad/pcm/CMakeLists.txt
+++ b/kicad/pcm/CMakeLists.txt
@@ -55,7 +55,10 @@ add_library( pcm_settings STATIC
# This is a circular dependency but it's not a problem for static libs.
# Refactoring this would need separating kicad_settings, settings manager
# and pgm_base out of common.
-target_link_libraries( pcm_settings common )
+target_link_libraries( pcm_settings
+ common
+ core
+)
target_include_directories(
pcm_settings
diff --git a/libs/CMakeLists.txt b/libs/CMakeLists.txt
index 66bab9e178..e4d39d3a40 100644
--- a/libs/CMakeLists.txt
+++ b/libs/CMakeLists.txt
@@ -22,6 +22,7 @@
#
# Build file for generic re-useable libraries
+add_subdirectory( core )
add_subdirectory( kimath )
add_subdirectory( kiplatform )
add_subdirectory( sexpr )
diff --git a/libs/core/CMakeLists.txt b/libs/core/CMakeLists.txt
new file mode 100644
index 0000000000..ff04d483f3
--- /dev/null
+++ b/libs/core/CMakeLists.txt
@@ -0,0 +1,18 @@
+# Add all the warnings to the files
+if( COMPILER_SUPPORTS_WARNINGS )
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${WARN_FLAGS_CXX}")
+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${WARN_FLAGS_C}")
+endif()
+
+
+add_library( core INTERFACE
+ # Just a header library right now
+)
+
+target_link_libraries( core INTERFACE
+ ${wxWidgets_LIBRARIES}
+)
+
+target_include_directories( core INTERFACE
+ ${CMAKE_CURRENT_SOURCE_DIR}/include
+)
diff --git a/libs/core/Readme.md b/libs/core/Readme.md
new file mode 100644
index 0000000000..2d9f1abb27
--- /dev/null
+++ b/libs/core/Readme.md
@@ -0,0 +1,3 @@
+This library contains base non-EDA items and extensions to libraries that are used throughout
+the KiCad codebase. This library should never depend on any parts of the KiCad code outside the
+thirdparty directory, since this is meant to be the lowest-level library in the dependency chain.
diff --git a/include/core/arraydim.h b/libs/core/include/core/arraydim.h
similarity index 100%
rename from include/core/arraydim.h
rename to libs/core/include/core/arraydim.h
diff --git a/include/core/kicad_algo.h b/libs/core/include/core/kicad_algo.h
similarity index 100%
rename from include/core/kicad_algo.h
rename to libs/core/include/core/kicad_algo.h
diff --git a/include/core/minoptmax.h b/libs/core/include/core/minoptmax.h
similarity index 100%
rename from include/core/minoptmax.h
rename to libs/core/include/core/minoptmax.h
diff --git a/include/core/spinlock.h b/libs/core/include/core/spinlock.h
similarity index 100%
rename from include/core/spinlock.h
rename to libs/core/include/core/spinlock.h
diff --git a/include/core/wx_stl_compat.h b/libs/core/include/core/wx_stl_compat.h
similarity index 100%
rename from include/core/wx_stl_compat.h
rename to libs/core/include/core/wx_stl_compat.h
diff --git a/libs/kimath/CMakeLists.txt b/libs/kimath/CMakeLists.txt
index d1f3279077..486a85fc99 100644
--- a/libs/kimath/CMakeLists.txt
+++ b/libs/kimath/CMakeLists.txt
@@ -38,6 +38,7 @@ add_library( kimath STATIC
)
target_link_libraries( kimath
+ core
clipper
clipper2
othermath
@@ -49,9 +50,13 @@ target_link_libraries( kimath
target_include_directories( kimath PUBLIC
${PROJECT_BINARY_DIR}
${CMAKE_CURRENT_SOURCE_DIR}/include
+
+ # This include REALLY shouldn't be here, but shape_arc.h grew a dependency on the units somehow
+ ${CMAKE_SOURCE_DIR}/include
)
target_include_directories( kimath PRIVATE
- ${PROJECT_SOURCE_DIR}/include # core/kicad_algo.h is needed for shape_arc
+ # This include REALLY shouldn't be here, but shape_arc grew a dependency on the units somehow
+ ${CMAKE_SOURCE_DIR}/include
${wxWidgets_LIBRARIES}
)
diff --git a/pagelayout_editor/CMakeLists.txt b/pagelayout_editor/CMakeLists.txt
index 95a92fe22c..f61d62b5da 100644
--- a/pagelayout_editor/CMakeLists.txt
+++ b/pagelayout_editor/CMakeLists.txt
@@ -85,6 +85,7 @@ target_link_libraries( pl_editor
# There's way too much crap coming in from common yet.
gal
common
+ core
${wxWidgets_LIBRARIES}
)
@@ -102,6 +103,7 @@ add_library( pl_editor_kiface MODULE
target_link_libraries( pl_editor_kiface
gal
common
+ core
${wxWidgets_LIBRARIES}
)
set_target_properties( pl_editor_kiface PROPERTIES
diff --git a/pcbnew/CMakeLists.txt b/pcbnew/CMakeLists.txt
index 5ed604be73..e72e2492f4 100644
--- a/pcbnew/CMakeLists.txt
+++ b/pcbnew/CMakeLists.txt
@@ -595,6 +595,7 @@ target_link_libraries( pcbnew
common
gal
scripting
+ core
nlohmann_json
rectpack2d
argparse::argparse
@@ -625,6 +626,7 @@ make_lexer(
target_link_libraries( pcbnew_kiface_objects
PRIVATE
common
+ core
dxflib_qcad
nanosvg
tinyspline_lib
@@ -672,6 +674,7 @@ set( PCBNEW_KIFACE_LIBRARIES
common
gal
scripting
+ core
dxflib_qcad
tinyspline_lib
idf3
diff --git a/qa/unittests/libs/kimath/CMakeLists.txt b/qa/unittests/libs/kimath/CMakeLists.txt
index 487f02bb1a..f220d0ca11 100644
--- a/qa/unittests/libs/kimath/CMakeLists.txt
+++ b/qa/unittests/libs/kimath/CMakeLists.txt
@@ -76,7 +76,6 @@ target_link_libraries( qa_kimath
)
target_include_directories( qa_kimath PRIVATE
- ${CMAKE_SOURCE_DIR}/include # Needed for core/optional.h
${CMAKE_SOURCE_DIR}/qa/mocks/include
${CMAKE_CURRENT_SOURCE_DIR}
)