[patch] rstudio-2022.07.2.576-fmt.patch

rstudio-2022.07.2.576-fmt.patch (text/plain), 1.10 KB, created by Mark Wright on 2022-10-27 10:02:11 UTC

--- rstudio-2022.07.2-576-orig/src/cpp/CMakeLists.txt	2022-08-31 23:09:53.000000000 +1000
+++ rstudio-2022.07.2-576/src/cpp/CMakeLists.txt	2022-10-10 09:39:17.365921162 +1100
@@ -566,7 +566,12 @@
 
 # external libraries
 add_subdirectory(ext)
-include_directories(SYSTEM "${FMT_SOURCE_DIR}/include")
+if(RSTUDIO_USE_SYSTEM_FMT)
+  find_library(FMT_LIB NAMES "fmt")  
+else()
+  set(FMT_LIB "fmt::fmt")
+  include_directories(SYSTEM "${FMT_SOURCE_DIR}/include")
+endif()
 
 # shared library
 add_subdirectory(shared_core)
--- rstudio-2022.07.2-576-orig/src/cpp/core/CMakeLists.txt	2022-08-31 23:09:53.000000000 +1000
+++ rstudio-2022.07.2-576/src/cpp/core/CMakeLists.txt	2022-10-10 09:39:17.365921162 +1100
@@ -319,7 +319,7 @@
    ${SOCI_LIBRARIES}
    ${CORE_SYSTEM_LIBRARIES}
    ${YAML_CPP_LIBRARIES}
-   fmt::fmt
+   ${FMT_LIB}
 )
 
 # define executable (for running unit tests)
--- rstudio-2022.07.2-576-orig/src/cpp/ext/CMakeLists.txt	2022-08-31 23:09:53.000000000 +1000
+++ rstudio-2022.07.2-576/src/cpp/ext/CMakeLists.txt	2022-10-10 09:39:17.366921124 +1100
@@ -14,6 +14,3 @@
 #
 
 project (EXT)
-
-add_subdirectory(fmt)
-