Attachment #825633 for bug #766294

Lines 566-572 Link Here

(-)rstudio-2022.07.2-576-orig/src/cpp/CMakeLists.txt (-1 / +6 lines)
566		566
567	# external libraries	567	# external libraries
568	add_subdirectory(ext)	568	add_subdirectory(ext)
569	include_directories(SYSTEM "${FMT_SOURCE_DIR}/include")	569	if(RSTUDIO_USE_SYSTEM_FMT)
		570	find_library(FMT_LIB NAMES "fmt")
		571	else()
		572	set(FMT_LIB "fmt::fmt")
		573	include_directories(SYSTEM "${FMT_SOURCE_DIR}/include")
		574	endif()
570		575
571	# shared library	576	# shared library
572	add_subdirectory(shared_core)	577	add_subdirectory(shared_core)

Lines 319-325 Link Here

(-)rstudio-2022.07.2-576-orig/src/cpp/core/CMakeLists.txt (-1 / +1 lines)
319	${SOCI_LIBRARIES}	319	${SOCI_LIBRARIES}
320	${CORE_SYSTEM_LIBRARIES}	320	${CORE_SYSTEM_LIBRARIES}
321	${YAML_CPP_LIBRARIES}	321	${YAML_CPP_LIBRARIES}
322	fmt::fmt	322	${FMT_LIB}
323	)	323	)
324		324
325	# define executable (for running unit tests)	325	# define executable (for running unit tests)

Lines 14-19 Link Here

(-)rstudio-2022.07.2-576-orig/src/cpp/ext/CMakeLists.txt (-3 lines)
14	#	14	#
15		15
16	project (EXT)	16	project (EXT)
17
18	add_subdirectory(fmt)
19

Return to bug 766294