1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
|
Avoid copying all of mathjax, pandoc, and node to the output.
Avoid building copies of existing libraries. Link with Guix-provided libraries instead.
--- a/src/cpp/session/CMakeLists.txt
+++ b/src/cpp/session/CMakeLists.txt
@@ -469,18 +469,6 @@
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/../../../NOTICE
${CMAKE_CURRENT_SOURCE_DIR}/resources COPYONLY)
-# configure custom panmirror script into the resources directory
-#
-# On Linux and Windows builders, found in the tools directory, on Mac and dev
-# environments found in the source tree.
-set(RSTUDIO_PANMIRROR_SCRIPT ${CMAKE_CURRENT_SOURCE_DIR}/../../gwt/lib/quarto/packages/editor-server/src/resources/md-writer.lua)
-if(NOT EXISTS "${RSTUDIO_PANMIRROR_SCRIPT}")
- set(RSTUDIO_PANMIRROR_SCRIPT ${RSTUDIO_TOOLS_ROOT}/../src/gwt/lib/quarto/packages/editor-server/src/resources/md-writer.lua)
-endif()
-file(MAKE_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/resources/panmirror-scripts)
-configure_file(${RSTUDIO_PANMIRROR_SCRIPT}
- ${CMAKE_CURRENT_SOURCE_DIR}/resources/panmirror-scripts/ COPYONLY)
-
# set include directories
include_directories(
include
@@ -682,9 +670,6 @@
# notice
install(FILES "resources/NOTICE"
DESTINATION ${RSTUDIO_INSTALL_SUPPORTING}/resources)
- # panmirror scripts
- install(DIRECTORY "resources/panmirror-scripts"
- DESTINATION ${RSTUDIO_INSTALL_SUPPORTING}/resources)
# citation
configure_file("resources/CITATION.in"
@@ -721,10 +706,6 @@
install(DIRECTORY "${RSTUDIO_DEPENDENCIES_DICTIONARIES_DIR}"
DESTINATION "${RSTUDIO_INSTALL_SUPPORTING}/resources")
- # install mathjax for local html preview
- install(DIRECTORY "${RSTUDIO_DEPENDENCIES_MATHJAX_DIR}"
- DESTINATION "${RSTUDIO_INSTALL_SUPPORTING}/resources")
-
# install quarto (or pandoc if quarto disabled)
if(QUARTO_ENABLED)
# install some quarto folders into Resources, as needed
@@ -742,9 +723,6 @@
EXCLUDE)
endif()
else()
- install(DIRECTORY "${RSTUDIO_DEPENDENCIES_PANDOC_DIR}/"
- DESTINATION "${RSTUDIO_INSTALL_BIN}/pandoc"
- USE_SOURCE_PERMISSIONS)
endif()
# install Copilot Language Server
--- a/src/cpp/ext/CMakeLists.txt
+++ b/src/cpp/ext/CMakeLists.txt
@@ -228,30 +228,3 @@
websocketpp WEBSOCKETPP
yaml-cpp YAML_CPP
zlib ZLIB)
-
-# Create rapidjson target.
-add_library(rstudio-rapidjson INTERFACE EXCLUDE_FROM_ALL)
-target_compile_definitions(rstudio-rapidjson INTERFACE "-DRAPIDJSON_NO_SIZETYPEDEFINE")
-target_include_directories(rstudio-rapidjson INTERFACE "${RAPIDJSON_SOURCE_DIR}/include")
-
-
-# Create websocketpp target.
-add_library(rstudio-websocketpp INTERFACE EXCLUDE_FROM_ALL)
-target_include_directories(rstudio-websocketpp INTERFACE "${WEBSOCKETPP_SOURCE_DIR}")
-
-
-# Create hunspell target.
-file(GLOB HUNSPELL_HEADER_FILES "${HUNSPELL_SOURCE_DIR}/src/hunspell/*.h*")
-file(GLOB HUNSPELL_SOURCE_FILES "${HUNSPELL_SOURCE_DIR}/src/hunspell/*.c*")
-add_library(rstudio-hunspell STATIC ${HUNSPELL_SOURCE_FILES} ${HUNSPELL_HEADER_FILES})
-set_target_properties(rstudio-hunspell PROPERTIES LINKER_LANGUAGE CXX)
-target_include_directories(rstudio-hunspell SYSTEM AFTER INTERFACE "${HUNSPELL_SOURCE_DIR}/src")
-target_compile_definitions(rstudio-hunspell PUBLIC HUNSPELL_STATIC=1)
-
-if(WIN32)
- target_include_directories(rstudio-hunspell SYSTEM AFTER PRIVATE "${HUNSPELL_PREFIX_DIR}/msvc")
- target_compile_options(rstudio-hunspell PRIVATE /wd4244 /wd4267)
- target_compile_options(rstudio-hunspell INTERFACE /wd4996)
-else()
- target_compile_options(rstudio-hunspell PRIVATE -Wno-deprecated-declarations -Wno-sign-compare -Wno-unused-but-set-variable)
-endif()
--- a/src/cpp/shared_core/CMakeLists.txt
+++ b/src/cpp/shared_core/CMakeLists.txt
@@ -46,6 +46,8 @@
set (SHARED_INCLUDE_DIRS
include
${BOOST_INCLUDEDIR}
+ ${rapidjson_INCLUDE_DIRS}
+ ${gsl_lite_INCLUDE_DIRS}
${EXT_SOURCE_DIR})
# UNIX specific
@@ -93,7 +94,7 @@
${Boost_LIBRARIES}
${SHARED_CORE_SYSTEM_LIBS}
- gsl::gsl-lite-v1
+ ${gsl_lite_LIBRARIES}
- rstudio-rapidjson)
+ ${rapidjson_LIBRARIES})
# Define executable for running unit tests
if (RSTUDIO_UNIT_TESTS_ENABLED)
--- a/src/cpp/core/CMakeLists.txt
+++ b/src/cpp/core/CMakeLists.txt
@@ -318,6 +318,10 @@
${EXT_SOURCE_DIR}
${CMAKE_CURRENT_BINARY_DIR}
${TESTS_INCLUDE_DIR}
+ ${hunspell_INCLUDE_DIRS}
+ ${tl-expected_INCLUDE_DIRS}
+ ${gsl_lite_INCLUDE_DIRS}
+ ${websocketpp_INCLUDE_DIRS}
)
# define shared library
@@ -327,8 +329,8 @@
# link dependencies
target_link_libraries(rstudio-core
rstudio-shared-core
- rstudio-hunspell
- rstudio-websocketpp
+ ${hunspell_LIBRARIES}
+ ${websocketpp_LIBRARIES}
${Boost_LIBRARIES}
${CRASHPAD_LIBRARIES}
${SOCI_LIBRARIES}
@@ -361,7 +363,7 @@
rstudio-shared-core
rstudio-core
rstudio-core-synctex
- rstudio-hunspell
+ ${hunspell_LIBRARIES}
${Boost_LIBRARIES}
${SOCI_LIBRARIES}
${CORE_SYSTEM_LIBRARIES}
--- a/src/cpp/CMakeLists.txt
+++ b/src/cpp/CMakeLists.txt
@@ -492,5 +492,11 @@
find_package(OpenSSL REQUIRED)
include_directories(SYSTEM "${OPENSSL_INCLUDE_DIR}")
+ find_package(fmt REQUIRED)
+ find_package(gsl-lite REQUIRED)
+ find_package(tl-expected REQUIRED)
+ find_package(yaml-cpp REQUIRED)
+ find_package(hunspell REQUIRED)
+ include_directories(SYSTEM "${hunspell_INCLUDE_DIRS}")
endif()
|
