Changeset View
Changeset View
Standalone View
Standalone View
devel/RStudio/files/patch-src_cpp_session_CMakeLists.txt
Show All 40 Lines | |||||
+#endif() | +#endif() | ||||
+set(LIBCLANG_HEADERS_DIR "${CMAKE_INSTALL_PREFIX}/include") | +set(LIBCLANG_HEADERS_DIR "${CMAKE_INSTALL_PREFIX}/include") | ||||
+#if(NOT EXISTS "${LIBCLANG_HEADERS_DIR}") | +#if(NOT EXISTS "${LIBCLANG_HEADERS_DIR}") | ||||
+# message(FATAL_ERROR "libclang builtin-headers not found (re-run install-dependencies script to install)") | +# message(FATAL_ERROR "libclang builtin-headers not found (re-run install-dependencies script to install)") | ||||
+#endif() | +#endif() | ||||
# include files | # include files | ||||
@@ -362,6 +362,9 @@ endif() | |||||
# define executable | |||||
add_executable(rsession ${SESSION_SOURCE_FILES} ${SESSION_HEADER_FILES}) | |||||
+# additional libraries | |||||
+target_link_libraries(rsession -L${FREEBSD_LIBDIR} -linotify -lprocstat) | |||||
+ | |||||
# skip libR RPATH at development time | |||||
if(RSTUDIO_DEVELOPMENT OR RSTUDIO_RUN_IN_PLACE) | |||||
set_target_properties(rsession PROPERTIES SKIP_BUILD_RPATH TRUE) | |||||
@@ -474,11 +477,11 @@ if (NOT RSTUDIO_SESSION_WIN64) | @@ -474,11 +477,11 @@ if (NOT RSTUDIO_SESSION_WIN64) | ||||
DESTINATION ${RSTUDIO_INSTALL_SUPPORTING}/resources) | DESTINATION ${RSTUDIO_INSTALL_SUPPORTING}/resources) | ||||
# install pandoc | # install pandoc | ||||
- set(PANDOC_BIN "${RSTUDIO_DEPENDENCIES_DIR}/common/pandoc/2.2.1") | - set(PANDOC_BIN "${RSTUDIO_DEPENDENCIES_DIR}/common/pandoc/2.2.1") | ||||
- file(GLOB PANDOC_FILES "${PANDOC_BIN}/pandoc*") | - file(GLOB PANDOC_FILES "${PANDOC_BIN}/pandoc*") | ||||
- install(FILES ${PANDOC_FILES} | - install(FILES ${PANDOC_FILES} | ||||
- PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE | - PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE | ||||
Show All 29 Lines |