Merge branch 'master' of git:cadabra2

kpeeters · Jul 4, 2024 · 681854a · 681854a
2 parents a848cc1 + ba90d0b
commit 681854a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -439,13 +439,13 @@ if(APPIMAGE_MODE)
   message(STATUS "Generating AppImage using ${DEPLOY_URL}")
   if(NOT EXISTS ${DEPLOY})
     message(STATUS "Downloading...")
-    file(DOWNLOAD ${DEPLOY_URL} ${DEPLOY})
-    execute_process(COMMAND chmod u+x ${DEPLOY})
+    file(DOWNLOAD ${DEPLOY_URL} ${CMAKE_BINARY_DIR}/${DEPLOY})
+    execute_process(COMMAND chmod u+x ${CMAKE_BINARY_DIR}/${DEPLOY})
   endif()
   add_custom_target(appimage
     COMMAND mkdir -p AppDir/usr/lib/python3/dist-packages
     COMMAND cp -a /usr/lib/python3/dist-packages/setuptools AppDir/usr/lib/python3/dist-packages/
-    COMMAND ./${DEPLOY} --appdir AppDir --desktop-file AppDir/usr/share/applications/science.cadabra.cadabra2-gtk.desktop --output appimage
+    COMMAND ${CMAKE_BINARY_DIR}/${DEPLOY} --appdir AppDir --desktop-file AppDir/usr/share/applications/science.cadabra.cadabra2-gtk.desktop --output appimage
     COMMAND mv Cadabra_2-${CMAKE_SYSTEM_PROCESSOR}.AppImage Cadabra_${CADABRA_VERSION_MAJOR}.${CADABRA_VERSION_MINOR}.${CADABRA_VERSION_PATCH}_${CMAKE_SYSTEM_PROCESSOR}.AppImage
   )
 endif()

diff --git a/README.rst b/README.rst
@@ -74,7 +74,6 @@ On Debian/Ubuntu you can install all that is needed with::
 
     sudo apt install git cmake libpython3-dev python3-dev g++ libgmp3-dev \
           libgtkmm-3.0-dev libboost-all-dev libgmp-dev libsqlite3-dev uuid-dev  \
-          texlive texlive-latex-extra texlive-science dvipng \
           python3-matplotlib python3-mpmath python3-sympy python3-gmpy2
 
 (on Ubuntu 14.04 you need to replace `cmake` with `cmake3` and also