|
|
7dc123a |
From 46a6b9240f420e39b482d7c1a93fc97a25483991 Mon Sep 17 00:00:00 2001
|
|
|
88447b8 |
From: =?UTF-8?q?I=C3=B1aki=20=C3=9Acar?= <iucar@fedoraproject.org>
|
|
|
7dc123a |
Date: Wed, 1 May 2024 15:54:55 +0200
|
|
|
7dc123a |
Subject: [PATCH] asdf
|
|
|
88447b8 |
|
|
|
88447b8 |
---
|
|
|
7dc123a |
src/cpp/session/CMakeLists.txt | 73 ----------------------------------
|
|
|
7dc123a |
1 file changed, 73 deletions(-)
|
|
|
88447b8 |
|
|
|
88447b8 |
diff --git a/src/cpp/session/CMakeLists.txt b/src/cpp/session/CMakeLists.txt
|
|
|
7dc123a |
index 0202e84..9d76499 100644
|
|
|
88447b8 |
--- a/src/cpp/session/CMakeLists.txt
|
|
|
88447b8 |
+++ b/src/cpp/session/CMakeLists.txt
|
|
|
7dc123a |
@@ -70,28 +70,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()
|
|
|
7dc123a |
-
|
|
|
17edcaf |
# verify embedded packages are available
|
|
|
17edcaf |
foreach(PKG ${RSTUDIO_EMBEDDED_PACKAGES})
|
|
|
7dc123a |
file(GLOB PKG_FILES "${RSTUDIO_DEPENDENCIES_DIR}/common/${PKG}*.tar.gz")
|
|
|
7dc123a |
@@ -688,57 +666,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 |
-
|
|
|
7dc123a |
- # install node
|
|
|
7dc123a |
- install(
|
|
|
7dc123a |
- DIRECTORY "${RSTUDIO_DEPENDENCIES_DIR}/common/node/${RSTUDIO_INSTALLED_NODE_VERSION}/"
|
|
|
7dc123a |
- DESTINATION "${RSTUDIO_INSTALL_BIN}/node"
|
|
|
7dc123a |
- USE_SOURCE_PERMISSIONS)
|
|
|
7dc123a |
-
|
|
|
63bc5c5 |
- # install quarto (or pandoc if quarto disabled)
|
|
|
63bc5c5 |
- if(QUARTO_ENABLED)
|
|
|
63bc5c5 |
- # install some quarto folders into Resources, as needed
|
|
|
63bc5c5 |
- if(APPLE)
|
|
|
e723746 |
- if (RSTUDIO_ELECTRON)
|
|
|
e723746 |
- install(DIRECTORY "${RSTUDIO_DEPENDENCIES_QUARTO_DIR}"
|
|
|
e723746 |
- DESTINATION "${RSTUDIO_INSTALL_RESOURCES}/app"
|
|
|
26ebe34 |
- USE_SOURCE_PERMISSIONS
|
|
|
26ebe34 |
- PATTERN ".gitignore"
|
|
|
26ebe34 |
- EXCLUDE)
|
|
|
e723746 |
- else()
|
|
|
e723746 |
- install(DIRECTORY "${RSTUDIO_DEPENDENCIES_QUARTO_DIR}"
|
|
|
e723746 |
- DESTINATION "${RSTUDIO_INSTALL_BIN}"
|
|
|
e723746 |
- USE_SOURCE_PERMISSIONS
|
|
|
26ebe34 |
- PATTERN "*/share"
|
|
|
26ebe34 |
- EXCLUDE
|
|
|
26ebe34 |
- PATTERN ".gitignore"
|
|
|
26ebe34 |
- EXCLUDE)
|
|
|
e723746 |
- install(DIRECTORY "${RSTUDIO_DEPENDENCIES_QUARTO_DIR}/share"
|
|
|
e723746 |
- DESTINATION "${RSTUDIO_INSTALL_SUPPORTING}/quarto"
|
|
|
26ebe34 |
- USE_SOURCE_PERMISSIONS
|
|
|
26ebe34 |
- PATTERN ".gitignore"
|
|
|
26ebe34 |
- EXCLUDE)
|
|
|
e723746 |
- endif()
|
|
|
63bc5c5 |
- else()
|
|
|
63bc5c5 |
- install(DIRECTORY "${RSTUDIO_DEPENDENCIES_QUARTO_DIR}"
|
|
|
63bc5c5 |
- DESTINATION "${RSTUDIO_INSTALL_BIN}"
|
|
|
26ebe34 |
- USE_SOURCE_PERMISSIONS
|
|
|
26ebe34 |
- PATTERN ".gitignore"
|
|
|
26ebe34 |
- EXCLUDE)
|
|
|
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 |
--
|
|
|
7dc123a |
2.44.0
|
|
|
88447b8 |
|