Skip to content

Commit 8e1eb68

Browse files
author
Kasper Peeters
committed
Also install glib-2.0 schemas on windows.
1 parent 3eff5d8 commit 8e1eb68

File tree

3 files changed

+9
-3
lines changed

3 files changed

+9
-3
lines changed

README.rst

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -389,7 +389,8 @@ hours, instead of just a few minutes with MSYS2. More info on building and
389389
packaging gtk apps on windows at https://www.gtk.org/docs/installations/windows/.
390390

391391
Install MSYS2 from https://www.msys2.org and start a UCRT64 shell.
392-
First update with::
392+
First update with (if you don't do this you may end up not being able
393+
to install some of the required packages due to version conflicts)::
393394

394395
pacman -Suy
395396

@@ -400,7 +401,7 @@ Then install a compiler and the dependencies of Cadabra with::
400401
pacman -S mingw-w64-ucrt-x86_64-boost
401402
pacman -S mingw-w64-ucrt-x86_64-sqlite3
402403
pacman -S mingw-w64-ucrt-x86_64-cmake
403-
pacman -S mingw-w64-x86_64-python-matplotlib
404+
pacman -S mingw-w64-ucrt-x86_64-python-matplotlib
404405
pacman -S mingw-w64-ucrt-x86_64-python-sympy
405406
pacman -S git
406407

cmake/packaging.cmake

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -201,6 +201,8 @@ endif()
201201

202202
if(WIN32)
203203
message("-- This is a Windows system")
204+
# A good resource (though not complete) for CPack on various platforms is
205+
# https://martin-fieber.de/blog/cmake-cpack-cross-platform-distributables/
204206
set(CPACK_GENERATOR NSIS)
205207
set(CPACK_PACKAGE_INSTALL_DIRECTORY "Cadabra")
206208
set(CPACK_NSIS_MODIFY_PATH ON)

frontend/gtkmm/CMakeLists.txt

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -276,6 +276,10 @@ if (NOT INSTALL_TARGETS_ONLY)
276276
execute_process(COMMAND cygpath -m "/ucrt64/lib/gdk-pixbuf-2.0" OUTPUT_VARIABLE WINGDK OUTPUT_STRIP_TRAILING_WHITESPACE)
277277
file(INSTALL ${WINGDK} DESTINATION ${CMAKE_INSTALL_PREFIX}/lib)
278278
]])
279+
install(CODE [[
280+
execute_process(COMMAND cygpath -m "/ucrt64/share/glib-2.0" OUTPUT_VARIABLE WINGLIB OUTPUT_STRIP_TRAILING_WHITESPACE)
281+
file(INSTALL ${WINGLIB} DESTINATION ${CMAKE_INSTALL_PREFIX}/share)
282+
]])
279283

280284
# Logic to get a start menu icon.
281285
set(CPACK_NSIS_CREATE_ICONS_EXTRA
@@ -285,7 +289,6 @@ if (NOT INSTALL_TARGETS_ONLY)
285289

286290
set(CPACK_PACKAGE_EXECUTABLES "cadabra2-gtk" "Cadabra2")
287291
set(CPACK_NSIS_MENU_LINKS "cadabra2-gtk" "Cadabra2.lnk")
288-
set(CPACK_NSIS_CREATE_ICONS_EXTRA "ReadINIStr \$STARTMENU_FOLDER \$INSTDIR\\\\CreateShortcuts.nsh")
289292
endif()
290293
endif()
291294

0 commit comments

Comments
 (0)