Skip to content

Commit

Permalink
Attempting to fix DESTDIR issue.
Browse files Browse the repository at this point in the history
  • Loading branch information
Kasper Peeters committed Sep 29, 2024
1 parent 730e1c2 commit 697a7ee
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 3 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/appimage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ jobs:
mkdir build
cd build
cmake -DENABLE_MATHEMATICA=OFF -DAPPIMAGE_MODE=ON -DCMAKE_INSTALL_PREFIX=/usr ..
make
make DESTDIR=AppDir
make install DESTDIR=AppDir
make appimage
mkdir -p ${{ github.workspace }}/artifacts
Expand Down
3 changes: 3 additions & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,9 @@ if(POLICY CMP0094)
cmake_policy(SET CMP0094 NEW)
message(STATUS "Set CMake policy CM0094 to NEW (use first Python found)")
endif()
if(POLICY CMP0169)
cmake_policy(SET CMP0169 OLD) # CMake 3.30: call FetchContent_Populate() with just the name of a dependency. This modern alternative was introduced in cmake 3.14 but we still support 3.12.
endif()

cmake_minimum_required(VERSION ${CADABRA_CMAKE_VERSION})
set(CMAKE_CXX_STANDARD 17)
Expand Down
4 changes: 2 additions & 2 deletions core/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -531,6 +531,6 @@ endif()
if(APPIMAGE_MODE)
# Install sympy. Matplotlib would be nice, but that pulls in blas and fortran and zillions of other things,
# which then don't link properly anymore either.
install(CODE "echo \"Installing python things in $ENV{DESTDIR}|${CMAKE_INSTALL_PREFIX}|${PYTHON_SITE_PATH}\"")
install(CODE "execute_process(COMMAND pip3 install --target $ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/${PYTHON_SITE_PATH} sympy)")
install(CODE "execute_process(COMMAND echo \"Installing python things in \$ENV{DESTDIR}|${CMAKE_INSTALL_PREFIX}|${PYTHON_SITE_PATH}\")")
install(CODE "execute_process(COMMAND pip3 install --target \$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/${PYTHON_SITE_PATH} sympy)")
endif()

0 comments on commit 697a7ee

Please sign in to comment.