646b892680
Some checks failed
Periodic Merges (6h) / master → staging-nixos (push) Failing after 12m50s
Periodic Merges (6h) / master → staging-next (push) Failing after 12m54s
Periodic Merges (24h) / merge-base(master,staging) → haskell-updates (push) Failing after 11m54s
Periodic Merges (6h) / staging-next → staging (push) Failing after 12m13s
Periodic Merges (24h) / staging-next-25.05 → staging-25.05 (push) Failing after 13m24s
Periodic Merges (24h) / release-25.05 → staging-next-25.05 (push) Failing after 14m28s
30 lines
1.2 KiB
Diff
30 lines
1.2 KiB
Diff
diff --git a/Tools/CMake/Install.cmake b/Tools/CMake/Install.cmake
|
|
index edd96b0..1fbdb3c 100644
|
|
--- a/Tools/CMake/Install.cmake
|
|
+++ b/Tools/CMake/Install.cmake
|
|
@@ -229,24 +229,10 @@ if(LINUX)
|
|
install(DIRECTORY ${CMAKE_SOURCE_DIR}/Resources/
|
|
DESTINATION ${JASP_INSTALL_RESOURCEDIR})
|
|
|
|
- install(
|
|
- DIRECTORY ${MODULES_BINARY_PATH}/binary_pkgs ${MODULES_BINARY_PATH}/manifests ${MODULES_BINARY_PATH}/module_libs ${MODULES_BINARY_PATH}/Tools
|
|
- DESTINATION ${JASP_INSTALL_MODULEDIR}
|
|
- REGEX ${FILES_EXCLUDE_PATTERN} EXCLUDE
|
|
- REGEX ${FOLDERS_EXCLUDE_PATTERN} EXCLUDE)
|
|
-
|
|
install(
|
|
FILES ${MODULES_BINARY_PATH}/modules-settings.json
|
|
DESTINATION ${JASP_INSTALL_MODULEDIR}
|
|
)
|
|
- # we do not need renv-root in an install
|
|
- #install(DIRECTORY ${MODULES_RENV_ROOT_PATH}/
|
|
- # DESTINATION ${JASP_INSTALL_PREFIX}/lib64/renv-root)
|
|
-
|
|
-if(NOT FLATPAK_USED) #because flatpak already puts renv-cache in /app/lib64 anyway
|
|
- install(DIRECTORY ${MODULES_RENV_CACHE_PATH}/
|
|
- DESTINATION ${JASP_INSTALL_PREFIX}/lib64/renv-cache)
|
|
-endif()
|
|
|
|
#Flatpak wrapper that sets some environment variables that JASP needs
|
|
install(PROGRAMS ${CMAKE_SOURCE_DIR}/Tools/flatpak/org.jaspstats.JASP
|