Skip to content

Fix generated proto exports in Windows shared builds #5346

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
PharahAmari wants to merge 1 commit into
base: main
Choose a base branch
from
+12 −1
Open

Fix generated proto exports in Windows shared builds #5346

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 12 additions & 1 deletion cmake/cpp.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -563,7 +563,18 @@ function(generate_proto_library)
${PROJECT_BINARY_DIR}
#$<TARGET_PROPERTY:protobuf::libprotobuf,INTERFACE_INCLUDE_DIRECTORIES>
)
target_compile_definitions(${PROTO_NAME}_proto PUBLIC ${OR_TOOLS_COMPILE_DEFINITIONS})
# OR_TOOLS_COMPILE_DEFINITIONS contains the import definition used by
# consumers of the generated proto library. Do not also pass it when
# compiling the proto objects themselves: MSVC otherwise sees both
# dllimport and dllexport, with dllimport winning because of command-line
# ordering, and rejects definitions of generated static data members.
set(PROTO_COMPILE_DEFINITIONS ${OR_TOOLS_COMPILE_DEFINITIONS})
if(MSVC AND BUILD_SHARED_LIBS)
list(FILTER PROTO_COMPILE_DEFINITIONS EXCLUDE REGEX
"^OR_${PROTO_UPPER_NAME}_PROTO_DLL=")
endif()
target_compile_definitions(${PROTO_NAME}_proto PUBLIC
${PROTO_COMPILE_DEFINITIONS})
if(MSVC AND BUILD_SHARED_LIBS)
target_compile_definitions(${PROTO_NAME}_proto INTERFACE "OR_${PROTO_UPPER_NAME}_PROTO_DLL=__declspec(dllimport)")
target_compile_definitions(${PROTO_NAME}_proto PRIVATE "OR_${PROTO_UPPER_NAME}_PROTO_DLL=__declspec(dllexport)")
Expand Down
Loading