5c41bc1cb9
- New upstream release 2022.12.0+353. - Add missing-include.patch to fix build by adding include. - Add unbundle-fmt.patch to use the system version of fmt. - Drop boost_patches.diff that landed upstream. - Use the correct soname for libclang. OBS-URL: https://build.opensuse.org/request/show/1069421 OBS-URL: https://build.opensuse.org/package/show/devel:languages:R:released/rstudio?expand=0&rev=85
25 lines
590 B
Diff
25 lines
590 B
Diff
diff --git a/src/cpp/CMakeLists.txt b/src/cpp/CMakeLists.txt
|
|
index b1a91eb..ff44703 100644
|
|
--- a/src/cpp/CMakeLists.txt
|
|
+++ b/src/cpp/CMakeLists.txt
|
|
@@ -580,7 +580,7 @@ endif()
|
|
|
|
# external libraries
|
|
add_subdirectory(ext)
|
|
-include_directories(SYSTEM "${FMT_SOURCE_DIR}/include")
|
|
+find_package(fmt REQUIRED)
|
|
|
|
# shared library
|
|
add_subdirectory(shared_core)
|
|
diff --git a/src/cpp/ext/CMakeLists.txt b/src/cpp/ext/CMakeLists.txt
|
|
index 2e08e79..0b4d5fa 100644
|
|
--- a/src/cpp/ext/CMakeLists.txt
|
|
+++ b/src/cpp/ext/CMakeLists.txt
|
|
@@ -14,6 +14,3 @@
|
|
#
|
|
|
|
project (EXT)
|
|
-
|
|
-add_subdirectory(fmt)
|
|
-
|