forked from mirrors/nixpkgs
33 lines
931 B
Diff
33 lines
931 B
Diff
|
--- a/src/cpp/session/CMakeLists.txt
|
||
|
|
+++ b/src/cpp/session/CMakeLists.txt
|
||
|
|
@@ -43,12 +43,6 @@
|
||
|
|
set(RSTUDIO_DEPENDENCIES_MATHJAX_DIR "${RSTUDIO_DEPENDENCIES_DIR}/mathjax-27")
|
||
|
|
endif()
|
||
|
|
|
||
|
|
- if(EXISTS "${RSTUDIO_TOOLS_ROOT}/quarto")
|
||
|
|
- set(RSTUDIO_DEPENDENCIES_QUARTO_DIR "${RSTUDIO_TOOLS_ROOT}/quarto")
|
||
|
|
- else()
|
||
|
|
- set(RSTUDIO_DEPENDENCIES_QUARTO_DIR "${RSTUDIO_DEPENDENCIES_DIR}/quarto")
|
||
|
|
- endif()
|
||
|
|
-
|
||
|
|
endif()
|
||
|
|
|
||
|
|
|
||
|
|
@@ -67,14 +61,7 @@
|
||
|
|
# validate our dependencies exist
|
||
|
|
foreach(VAR RSTUDIO_DEPENDENCIES_DICTIONARIES_DIR
|
||
|
|
RSTUDIO_DEPENDENCIES_MATHJAX_DIR
|
||
|
|
- RSTUDIO_DEPENDENCIES_PANDOC_DIR
|
||
|
|
- RSTUDIO_DEPENDENCIES_QUARTO_DIR)
|
||
|
|
-
|
||
|
|
-
|
||
|
|
- # skip quarto if not enabled
|
||
|
|
- if("${VAR}" STREQUAL "RSTUDIO_DEPENDENCIES_QUARTO_DIR" AND NOT QUARTO_ENABLED)
|
||
|
|
- continue()
|
||
|
|
- endif()
|
||
|
|
+ RSTUDIO_DEPENDENCIES_PANDOC_DIR)
|
||
|
|
|
||
|
|
# validate existence
|
||
|
|
if(NOT EXISTS "${${VAR}}")
|
||
|
|
|