Skip to content

Commit 034368a

Browse files
author
Kasper Peeters
committed
Fix pixbufloader-svg reference. Remove old installation code on windows.
1 parent d6ede34 commit 034368a

File tree

2 files changed

+1
-9
lines changed

2 files changed

+1
-9
lines changed

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -529,7 +529,7 @@ if(WIN32)
529529
add_custom_command(
530530
OUTPUT dummy1
531531
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/libpixbufloader-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"
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"
533533
COMMAND touch dummy1
534534
VERBATIM
535535
DEPENDS core/cadabra2.pyd ${EXECUTABLES}

frontend/gtkmm/CMakeLists.txt

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -315,14 +315,6 @@ if (NOT INSTALL_TARGETS_ONLY)
315315
install(DIRECTORY icons/hicolor DESTINATION share/icons)
316316
winstall(DIRECTORY /${MSYS_ENV}/lib/gdk-pixbuf-2.0 DESTINATION lib)
317317
winstall(DIRECTORY /${MSYS_ENV}/share/glib-2.0 DESTINATION share)
318-
# install(CODE "
319-
# execute_process(COMMAND cygpath -m \"/${MSYS_ENV}/lib/gdk-pixbuf-2.0\" OUTPUT_VARIABLE WINGDK OUTPUT_STRIP_TRAILING_WHITESPACE)
320-
# file(INSTALL ${WINGDK} DESTINATION \"${CMAKE_INSTALL_PREFIX}/lib\")
321-
# ")
322-
# install(CODE "
323-
# execute_process(COMMAND touch \"/${MSYS_ENV}/share/glib-2.0\" OUTPUT_VARIABLE WINGLIB OUTPUT_STRIP_TRAILING_WHITESPACE)
324-
# file(INSTALL ${WINGLIB} DESTINATION \"${CMAKE_INSTALL_PREFIX}/share\")
325-
# ")
326318

327319
set_property(INSTALL "${CDB_BIN_PATH}/cadabra2-gtk"
328320
PROPERTY CPACK_START_MENU_SHORTCUTS "Cadabra"

0 commit comments

Comments
 (0)