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

Try to fix linking after constexpr change 

Somehow, GCC 10 and 11 were unable to locate the prebuild colors when
they were constexpr in gal, so give them on the link line again.
This commit is contained in:
Ian McInerney 2023-04-06 15:20:16 +01:00
parent deb2bc0ac8
commit dc08c48f33
5 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
cvpcb/CMakeLists.txt
View File

@ -72,6 +72,7 @@ target_link_libraries( cvpcb_kiface
3d-viewer
gal
common
gal # Circular dependency between gal and common now
kimath
${PCBNEW_IO_LIBRARIES}
Boost::headers

2
eeschema/CMakeLists.txt
View File

@ -437,6 +437,7 @@ target_link_libraries( eeschema
# There's way too much crap coming in from common yet.
gal
common
gal # Circular dependency between gal and common now
argparse::argparse
${wxWidgets_LIBRARIES}
)
@ -480,6 +481,7 @@ target_link_libraries( eeschema_kiface
PRIVATE
common
eeschema_kiface_objects
gal # Circular dependency between gal and common now
markdown_lib
scripting
sexpr

2
gerbview/CMakeLists.txt
View File

@ -112,6 +112,7 @@ target_link_libraries( gerbview
# There's way too much crap coming in from common yet.
gal
common
gal # Circular dependency between gal and common now
core
nlohmann_json
${wxWidgets_LIBRARIES}
@ -155,6 +156,7 @@ target_link_libraries( gerbview_kiface
nlohmann_json
gal
common
gal # Circular dependency between gal and common now
core
gerbview_kiface_objects
${wxWidgets_LIBRARIES}

2
pagelayout_editor/CMakeLists.txt
View File

@ -85,6 +85,7 @@ target_link_libraries( pl_editor
# There's way too much crap coming in from common yet.
gal
common
gal # Circular dependency between gal and common now
core
${wxWidgets_LIBRARIES}
)
@ -103,6 +104,7 @@ add_library( pl_editor_kiface MODULE
target_link_libraries( pl_editor_kiface
gal
common
gal # Circular dependency between gal and common now
core
${wxWidgets_LIBRARIES}
)

1
pcbnew/CMakeLists.txt
View File

@ -626,6 +626,7 @@ make_lexer(
target_link_libraries( pcbnew_kiface_objects
PRIVATE
common
gal # Circular dependency between gal and common now
core
dxflib_qcad
nanosvg