|
 |
63bc5c5 |
From 58133b08c006c8f315dacb841f90823eec4b7e48 Mon Sep 17 00:00:00 2001
|
|
|
88447b8 |
From: =?UTF-8?q?I=C3=B1aki=20=C3=9Acar?= <iucar@fedoraproject.org>
|
|
|
63bc5c5 |
Date: Fri, 18 Mar 2022 20:18:08 +0100
|
|
|
17edcaf |
Subject: [PATCH] unbundle dependencies common
|
|
|
88447b8 |
|
|
|
88447b8 |
---
|
|
|
63bc5c5 |
src/cpp/session/CMakeLists.txt | 52 ----------------------------------
|
|
|
63bc5c5 |
1 file changed, 52 deletions(-)
|
|
|
88447b8 |
|
|
|
88447b8 |
diff --git a/src/cpp/session/CMakeLists.txt b/src/cpp/session/CMakeLists.txt
|
|
|
63bc5c5 |
index 1dfc977..07c742c 100644
|
|
|
88447b8 |
--- a/src/cpp/session/CMakeLists.txt
|
|
|
88447b8 |
+++ b/src/cpp/session/CMakeLists.txt
|
|
|
63bc5c5 |
@@ -64,28 +64,6 @@ else()
|
|
|
5bda2e2 |
endif()
|
|
|
88447b8 |
|
|
|
63bc5c5 |
|
|
|
d4512ba |
-# validate our dependencies exist
|
|
|
d4512ba |
-foreach(VAR RSTUDIO_DEPENDENCIES_DICTIONARIES_DIR
|
|
|
d4512ba |
- RSTUDIO_DEPENDENCIES_MATHJAX_DIR
|
|
|
63bc5c5 |
- RSTUDIO_DEPENDENCIES_PANDOC_DIR
|
|
|
63bc5c5 |
- RSTUDIO_DEPENDENCIES_QUARTO_DIR)
|
|
|
63bc5c5 |
-
|
|
|
63bc5c5 |
-
|
|
|
63bc5c5 |
- # skip quarto if not enabled
|
|
|
63bc5c5 |
- if("${VAR}" STREQUAL "RSTUDIO_DEPENDENCIES_QUARTO_DIR" AND NOT QUARTO_ENABLED)
|
|
|
63bc5c5 |
- continue()
|
|
|
63bc5c5 |
- endif()
|
|
|
d4512ba |
-
|
|
|
d4512ba |
- # validate existence
|
|
|
d4512ba |
- if(NOT EXISTS "${${VAR}}")
|
|
|
d4512ba |
- message(FATAL_ERROR "${${VAR}} not found (re-run install-dependencies script to install")
|
|
|
5bda2e2 |
- endif()
|
|
|
d4512ba |
-
|
|
|
d4512ba |
- # cache variables so they can be seen by configure_file
|
|
|
d4512ba |
- set("${VAR}" "${${VAR}}" CACHE INTERNAL "")
|
|
|
d4512ba |
-
|
|
|
5bda2e2 |
-endforeach()
|
|
|
88447b8 |
-
|
|
|
17edcaf |
# verify embedded packages are available
|
|
|
17edcaf |
foreach(PKG ${RSTUDIO_EMBEDDED_PACKAGES})
|
|
|
17edcaf |
file(GLOB PKG_FILES "${RSTUDIO_DEPENDENCIES_DIR}/common/${PKG}*.tar.gz")
|
|
|
63bc5c5 |
@@ -664,36 +642,6 @@ if(NOT RSTUDIO_SESSION_WIN32 AND NOT RSESSION_ALTERNATE_BUILD)
|
|
|
5bda2e2 |
install(DIRECTORY "resources/dependencies"
|
|
|
5bda2e2 |
DESTINATION ${RSTUDIO_INSTALL_SUPPORTING}/resources)
|
|
|
88447b8 |
|
|
|
88447b8 |
- # install hunspell dictionaries
|
|
|
5bda2e2 |
- install(DIRECTORY "${RSTUDIO_DEPENDENCIES_DICTIONARIES_DIR}"
|
|
|
88447b8 |
- DESTINATION "${RSTUDIO_INSTALL_SUPPORTING}/resources")
|
|
|
88447b8 |
-
|
|
|
88447b8 |
- # install mathjax for local html preview
|
|
|
5bda2e2 |
- install(DIRECTORY "${RSTUDIO_DEPENDENCIES_MATHJAX_DIR}"
|
|
|
88447b8 |
- DESTINATION "${RSTUDIO_INSTALL_SUPPORTING}/resources")
|
|
|
88447b8 |
-
|
|
|
63bc5c5 |
- # install quarto (or pandoc if quarto disabled)
|
|
|
63bc5c5 |
- if(QUARTO_ENABLED)
|
|
|
63bc5c5 |
- # install some quarto folders into Resources, as needed
|
|
|
63bc5c5 |
- if(APPLE)
|
|
|
63bc5c5 |
- install(DIRECTORY "${RSTUDIO_DEPENDENCIES_QUARTO_DIR}"
|
|
|
63bc5c5 |
- DESTINATION "${RSTUDIO_INSTALL_BIN}"
|
|
|
63bc5c5 |
- USE_SOURCE_PERMISSIONS
|
|
|
63bc5c5 |
- PATTERN "*/share" EXCLUDE)
|
|
|
63bc5c5 |
- install(DIRECTORY "${RSTUDIO_DEPENDENCIES_QUARTO_DIR}/share"
|
|
|
63bc5c5 |
- DESTINATION "${RSTUDIO_INSTALL_SUPPORTING}/quarto"
|
|
|
63bc5c5 |
- USE_SOURCE_PERMISSIONS)
|
|
|
63bc5c5 |
- else()
|
|
|
63bc5c5 |
- install(DIRECTORY "${RSTUDIO_DEPENDENCIES_QUARTO_DIR}"
|
|
|
63bc5c5 |
- DESTINATION "${RSTUDIO_INSTALL_BIN}"
|
|
|
63bc5c5 |
- USE_SOURCE_PERMISSIONS)
|
|
|
63bc5c5 |
- endif()
|
|
|
63bc5c5 |
- else()
|
|
|
63bc5c5 |
- install(DIRECTORY "${RSTUDIO_DEPENDENCIES_PANDOC_DIR}/"
|
|
|
63bc5c5 |
- DESTINATION "${RSTUDIO_INSTALL_BIN}/pandoc"
|
|
|
63bc5c5 |
- USE_SOURCE_PERMISSIONS)
|
|
|
63bc5c5 |
- endif()
|
|
|
88447b8 |
-
|
|
|
17edcaf |
# install embedded packages
|
|
|
17edcaf |
foreach(PKG ${RSTUDIO_EMBEDDED_PACKAGES})
|
|
|
17edcaf |
file(GLOB PKG_FILES "${RSTUDIO_DEPENDENCIES_DIR}/common/${PKG}*.tar.gz")
|
|
|
88447b8 |
--
|
|
|
5bda2e2 |
2.31.1
|
|
|
88447b8 |
|