fix: missing -DPROTOBUF_USE_DLLS in pkg-config (#12700)

When the protobuf libraries have been compiled as shared libraries the users of the library need to add `-DPROTOBUF_USE_DLLS` to their build line. Otherwise some symbols are missing. Fixes #12699 FWIW, I am not sure this is an ideal fix. It may be better to fix the headers such that no macros change the ABI. Closes #12700 COPYBARA_INTEGRATE_REVIEW=#12700 from coryan:fix-define-protobuf-use-dlls-in-pkg-config-file 13c792e PiperOrigin-RevId: 530116678
protocolbuffers · May 7, 2023 · f86008a · f86008a
1 parent da2c4a6
commit f86008a
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/cmake/install.cmake b/cmake/install.cmake
@@ -12,6 +12,10 @@ foreach (_target IN LISTS _pc_target_list)
   string(CONCAT _protobuf_PC_REQUIRES "${_protobuf_PC_REQUIRES}" "${_sep}" "${_target}")
   set(_sep " ")
 endforeach ()
+set(_protobuf_PC_CFLAGS)
+if (protobuf_BUILD_SHARED_LIBS)
+  set(_protobuf_PC_CFLAGS -DPROTOBUF_USE_DLLS)
+endif ()
 
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/cmake/protobuf.pc.cmake
                ${CMAKE_CURRENT_BINARY_DIR}/protobuf.pc @ONLY)

diff --git a/cmake/protobuf-lite.pc.cmake b/cmake/protobuf-lite.pc.cmake
@@ -8,5 +8,5 @@ Description: Google's Data Interchange Format
 Version: @protobuf_VERSION@
 Requires: @_protobuf_PC_REQUIRES@
 Libs: -L${libdir} -lprotobuf-lite @CMAKE_THREAD_LIBS_INIT@
-Cflags: -I${includedir}
+Cflags: -I${includedir} @_protobuf_PC_CFLAGS@
 Conflicts: protobuf
diff --git a/cmake/protobuf.pc.cmake b/cmake/protobuf.pc.cmake
@@ -8,5 +8,5 @@ Description: Google's Data Interchange Format
 Version: @protobuf_VERSION@
 Requires: @_protobuf_PC_REQUIRES@
 Libs: -L${libdir} -lprotobuf @CMAKE_THREAD_LIBS_INIT@
-Cflags: -I${includedir}
+Cflags: -I${includedir} @_protobuf_PC_CFLAGS@
 Conflicts: protobuf-lite