Skip to content

Commit 89d3512

Browse files
author
Kasper Peeters
committed
Add two dlls which did not get included on ARM64.
1 parent 358d3cb commit 89d3512

File tree

1 file changed

+7
-1
lines changed

1 file changed

+7
-1
lines changed

CMakeLists.txt

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -526,10 +526,12 @@ if(WIN32)
526526
# folder ready to be processed by `install`. The 'ldd' command does not
527527
# run on the '*.pyd' file, but if we rename or copy it to have extension '.dll'
528528
# all goes through fine...
529+
set(LDDSTR "ldd /${MSYS_ENV}/lib/gdk-pixbuf-2.0/2.10.0/loaders/pixbufloader_svg.dll core/cadabra2.dll ${LEXECUTABLES} | sed -e '/not found/d' -e '/Windows/d' -e '/System32/d' -e '/SysWOW64/d' | grep '=>' | sed -e 's/^[^=]*=>[ ]*\\([^ ]*\\).*/\\1/' | sort | uniq > ${CMAKE_BINARY_DIR}/ldd_dependencies.txt")
530+
message(STATUS "Determining dependencies using command ${LDDSTR}")
529531
add_custom_command(
530532
OUTPUT dummy1
531533
COMMAND cp core/cadabra2.pyd core/cadabra2.dll
532-
COMMAND ${CMAKE_COMMAND} -E env bash -c "ldd /${MSYS_ENV}/lib/gdk-pixbuf-2.0/2.10.0/loaders/pixbufloader_svg.dll core/cadabra2.dll ${LEXECUTABLES} | sed -e '/not found/d' -e '/Windows/d' -e '/System32/d' -e '/SysWOW64/d' | grep '=>' | sed -e 's/^[^=]*=>[ ]*\\([^ ]*\\).*/\\1/' | sort | uniq > ${CMAKE_BINARY_DIR}/ldd_dependencies.txt"
534+
COMMAND ${CMAKE_COMMAND} -E env bash -c "${LDDSTR}"
533535
COMMAND touch dummy1
534536
VERBATIM
535537
DEPENDS core/cadabra2.pyd ${EXECUTABLES}
@@ -569,6 +571,10 @@ if(WIN32)
569571
winstall(FILES /${MSYS_ENV}/bin/libzstd.dll DESTINATION .)
570572
winstall(FILES /${MSYS_ENV}/bin/libimagequant.dll DESTINATION .)
571573
winstall(FILES /${MSYS_ENV}/bin/libopenjp2-7.dll DESTINATION .)
574+
575+
# These are necessary only on ARM64.
576+
winstall(FILES /${MSYS_ENV}/bin/libgmp-10.dll DESTINATION .)
577+
winstall(FILES /${MSYS_ENV}/bin/libgmpxx-4.dll DESTINATION .)
572578

573579
# We need gdbus to setup the dbus, needed by Glib, otherwise anything
574580
# gtk-related will just bail out at start. We also need the helper

0 commit comments

Comments
 (0)