Update packaging scripts and add more verbose output to main CMakeLis…

…ts.txt.

.github/workflows/ubuntu-package.yml → .github/workflows/ubuntu-22.04-package.yml

@@ -52,14 +52,9 @@ jobs:
         echo "VERSION=$VER" >> $GITHUB_ENV
 
     - name: Upload Release Assets
-        run: |
-          gh release upload "${{ env.VERSION }}" build/cadabra2-${{ env.VERSION }}-jammy.deb --clobber
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      run: |
+        gh release upload "${{ env.VERSION }}" build/cadabra2-${{ env.VERSION }}-jammy.deb --clobber
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
-#     - name: Upload artifact to github assets
-#       uses: actions/upload-artifact@main
-#       with:
-#         name: cadabra2-${{ env.VERSION }}-jammy.deb
-#         path: build/cadabra2-${{ env.VERSION }}-jammy.deb
 

.github/workflows/ubuntu-24.04-package.yml

@@ -57,9 +57,4 @@ jobs:
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
-#     - name: Upload artifact to github assets
-#       uses: actions/upload-artifact@main
-#       with:
-#         name: cadabra2-${{ env.VERSION }}-jammy.deb
-#         path: build/cadabra2-${{ env.VERSION }}-jammy.deb
 

CMakeLists.txt

@@ -5,18 +5,23 @@ set(CADABRA_CMAKE_VERSION 3.12)
 
 if(POLICY CMP0042)
   cmake_policy(SET CMP0042 NEW)
+  message(STATUS "Set CMake policy CM0042 to NEW")
 endif()
 if(POLICY CMP0054)
   cmake_policy(SET CMP0054 NEW)
+  message(STATUS "Set CMake policy CM0054 to NEW")
 endif()
 if(POLICY CMP0127)
   cmake_policy(SET CMP0127 NEW)
+  message(STATUS "Set CMake policy CM0127 to NEW")
 endif()
 if(POLICY CMP0148)
   cmake_policy(SET CMP0148 NEW)
+  message(STATUS "Set CMake policy CM0148 to NEW")
 endif()
 if(POLICY CMP0167)
   cmake_policy(SET CMP0167 NEW)
+  message(STATUS "Set CMake policy CM0167 to NEW")
 endif()
 
 cmake_minimum_required(VERSION ${CADABRA_CMAKE_VERSION})

cmake/packaging.cmake

@@ -152,8 +152,13 @@ else()
 	set(CPACK_DEBIAN_PACKAGE_DEPENDS "python3, libgmpxx4ldbl, libboost-system1.71.0, libboost-filesystem1.71.0, libboost-program-options1.71.0, libboost-regex1.71.0, libstdc++6, uuid-runtime, libgtkmm-3.0-1v5, texlive, texlive-latex-extra, texlive-science, python3-matplotlib, python3-mpmath, dvipng, python3-sympy, python3-gmpy2")
    	message("-- This is an Ubuntu 20.04 system")
       endif()
-      if(LINUX_ISSUE MATCHES "24.04")
+      if(LINUX_ISSUE MATCHES "22.04")
    	set(CPACK_SYSTEM_NAME "jammy")
+	set(CPACK_DEBIAN_PACKAGE_DEPENDS "python3, libgmpxx4ldbl, libboost-system1.74.0, libboost-filesystem1.74.0, libboost-program-options1.74.0, libboost-regex1.74.0, libstdc++6, uuid-runtime, libgtkmm-3.0-1v5, python3-matplotlib, python3-mpmath, python3-sympy, python3-gmpy2")
+   	message("-- This is an Ubuntu 22.04 system")
+      endif()
+      if(LINUX_ISSUE MATCHES "24.04")
+   	set(CPACK_SYSTEM_NAME "noble")
 	set(CPACK_DEBIAN_PACKAGE_DEPENDS "python3, libgmpxx4ldbl, libboost-system1.83.0, libboost-filesystem1.83.0, libboost-program-options1.83.0, libboost-regex1.83.0, libstdc++6, uuid-runtime, libgtkmm-3.0-1t64, python3-matplotlib, python3-mpmath, python3-sympy, python3-gmpy2")
    	message("-- This is an Ubuntu 24.04 system")
       endif()