Don't link gdiplus everywhere anymore

Tested on msys2 which is the only place it would have been buggy
CMake seems to share the gdiplus linkage with the other dependencies automatically now
This commit is contained in:
Marek Roszko 2022-08-23 23:15:11 -04:00
parent 0070cbd2ad
commit fc99b3ba95
9 changed files with 6 additions and 13 deletions

View File

@ -768,11 +768,6 @@ find_package( Fontconfig REQUIRED )
# Include MinGW resource compiler.
include( MinGWResourceCompiler )
if( WIN32 )
# we need the gdiplus library for cairo printing on windows
set( GDI_PLUS_LIBRARIES gdiplus )
endif()
# Find ngspice library, required for integrated circuit simulator
if( KICAD_SPICE )
find_package( ngspice REQUIRED )

View File

@ -44,6 +44,11 @@ set( GAL_SRCS
add_library( gal STATIC ${GAL_SRCS} )
if( WIN32 )
# we need the gdiplus library for cairo printing on windows
set( GDI_PLUS_LIBRARIES gdiplus )
endif()
target_link_libraries( gal
common # This is needed until the circular dependency is removed
kimath

View File

@ -76,7 +76,6 @@ target_link_libraries( cvpcb_kiface
kimath
${PCBNEW_IO_LIBRARIES}
${wxWidgets_LIBRARIES}
${GDI_PLUS_LIBRARIES}
)
# Must follow github_plugin
@ -85,7 +84,7 @@ target_link_libraries( cvpcb_kiface ${Boost_LIBRARIES} )
target_include_directories( cvpcb_kiface PRIVATE
$<TARGET_PROPERTY:thread-pool,INTERFACE_INCLUDE_DIRECTORIES>
)
if( UNIX AND NOT APPLE )
# -lrt must follow Boost
target_link_libraries( cvpcb_kiface rt )

View File

@ -468,7 +468,6 @@ target_link_libraries( eeschema_kiface
scripting
sexpr
${wxWidgets_LIBRARIES}
${GDI_PLUS_LIBRARIES}
)
if( KICAD_SPICE )

View File

@ -156,7 +156,6 @@ target_link_libraries( gerbview_kiface
gal
common
${wxWidgets_LIBRARIES}
${GDI_PLUS_LIBRARIES}
)
set_source_files_properties( gerbview.cpp PROPERTIES
# The KIFACE is in gerbview.cpp, export it:

View File

@ -87,7 +87,6 @@ else()
gal
common #repeated due to a circular dependency between gal and common
${wxWidgets_LIBRARIES}
${GDI_PLUS_LIBRARIES}
)
endif()

View File

@ -109,7 +109,6 @@ target_link_libraries( pl_editor_kiface
gal
common
${wxWidgets_LIBRARIES}
${GDI_PLUS_LIBRARIES}
)
set_target_properties( pl_editor_kiface PROPERTIES
OUTPUT_NAME pl_editor

View File

@ -719,7 +719,6 @@ set( PCBNEW_KIFACE_LIBRARIES
markdown_lib
${PCBNEW_IO_LIBRARIES}
${wxWidgets_LIBRARIES}
${GDI_PLUS_LIBRARIES}
${PYTHON_LIBRARIES}
${Boost_LIBRARIES}
${PCBNEW_EXTRA_LIBS} # -lrt must follow Boost

View File

@ -74,7 +74,6 @@ target_link_libraries( qa_pcbnew_utils PUBLIC
# unit_test_utils
# ${PCBNEW_IO_LIBRARIES}
# ${wxWidgets_LIBRARIES}
# ${GDI_PLUS_LIBRARIES}
# ${PYTHON_LIBRARIES}
# ${Boost_LIBRARIES} # must follow GITHUB
# ${PCBNEW_EXTRA_LIBS} # -lrt must follow Boost