add shared library support to add_fbthrift_cpp_library

michel-slm · facebook-github-bot · commit 37a50997931a · 2020-11-12T10:56:22.000-08:00
Summary:
`add_fbthrift_cpp_library` should honor `BUILD_SHARED_LIBS`, and call
`add_library` with the right setting (`SHARED` if enabled, `STATIC` otherwise)

Reviewed By: yns88

Differential Revision: D24911124

fbshipit-source-id: 79df7640a758a592a3df3e9e79bb129dd57f2d47
diff --git a/build/fbcode_builder/CMake/FBThriftCppLibrary.cmake b/build/fbcode_builder/CMake/FBThriftCppLibrary.cmake
@@ -127,8 +127,14 @@ function(add_fbthrift_cpp_library LIB_NAME THRIFT_FILE)
   )
 
   # Now emit the library rule to compile the sources
+  if (BUILD_SHARED_LIBS)
+    set(LIB_TYPE SHARED)
+  else ()
+    set(LIB_TYPE STATIC)
+  endif ()
+
   add_library(
-    "${LIB_NAME}" STATIC
+    "${LIB_NAME}" ${LIB_TYPE}
     ${generated_sources}
   )
 

Original file line number	Diff line number	Diff line change
`@@ -127,8 +127,14 @@ function(add_fbthrift_cpp_library LIB_NAME THRIFT_FILE)`
`127`	`127`	`)`
`128`	`128`
`129`	`129`	`# Now emit the library rule to compile the sources`
	`130`	`+ if (BUILD_SHARED_LIBS)`
	`131`	`+ set(LIB_TYPE SHARED)`
	`132`	`+ else ()`
	`133`	`+ set(LIB_TYPE STATIC)`
	`134`	`+ endif ()`
	`135`	`+`
`130`	`136`	`add_library(`
`131`		`- "${LIB_NAME}" STATIC`
	`137`	`+ "${LIB_NAME}" ${LIB_TYPE}`
`132`	`138`	`${generated_sources}`
`133`	`139`	`)`
`134`	`140`