Try to fix linking of expat

This commit is contained in:
tamasmeszaros 2022-05-16 14:58:17 +02:00 committed by Lukas Matena
parent 97a9c1ae1d
commit e2007e41ba
3 changed files with 8 additions and 4 deletions

View File

@ -430,8 +430,12 @@ include_directories(BEFORE SYSTEM ${EIGEN3_INCLUDE_DIR})
find_package(EXPAT REQUIRED)
if (NOT TARGET EXPAT::EXPAT AND TARGET expat::expat)
add_library(EXPAT::EXPAT ALIAS expat::expat)
add_library(libexpat INTERFACE)
if (TARGET EXPAT::EXPAT )
target_link_libraries(libexpat INTERFACE EXPAT::EXPAT)
elseif(TARGET expat::expat)
target_link_libraries(libexpat INTERFACE expat::expat)
endif ()
find_package(PNG REQUIRED)

View File

@ -82,7 +82,7 @@ if (SLIC3R_GUI)
string(REGEX MATCH "wxexpat" WX_EXPAT_BUILTIN ${wxWidgets_LIBRARIES})
if (EXPAT_FOUND AND NOT WX_EXPAT_BUILTIN)
list(FILTER wxWidgets_LIBRARIES EXCLUDE REGEX expat)
list(APPEND wxWidgets_LIBRARIES EXPAT::EXPAT)
list(APPEND wxWidgets_LIBRARIES libexpat)
endif ()
# This is an issue in the new wxWidgets cmake build, doesn't deal with librt

View File

@ -384,7 +384,7 @@ target_link_libraries(libslic3r
boost_libs
clipper
nowide
EXPAT::EXPAT
libexpat
glu-libtess
qhull
semver