From 08a4b4998a0a8a5d6d5d29b69ca257192046d628 Mon Sep 17 00:00:00 2001 From: Corentin Le Molgat Date: Mon, 27 Jan 2025 04:02:47 -0800 Subject: [PATCH] fix proto .cc build --- cmake/cpp.cmake | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/cmake/cpp.cmake b/cmake/cpp.cmake index c4700d0a99..f143c073b3 100644 --- a/cmake/cpp.cmake +++ b/cmake/cpp.cmake @@ -377,13 +377,7 @@ function(generate_proto_library) else() set_target_properties(${PROTO_NAME}_proto PROPERTIES CXX_STANDARD 17) endif() - if(MSVC AND BUILD_SHARED_LIBS) - target_compile_definitions(${PROTO_NAME}_proto INTERFACE "OR_PROTO_DLL=__declspec(dllimport)") - target_compile_definitions(${PROTO_NAME}_proto PRIVATE "OR_PROTO_DLL=__declspec(dllexport)") - else() - target_compile_definitions(${PROTO_NAME}_proto PUBLIC "OR_PROTO_DLL=") -endif() - set_target_properties(${PROTO_NAME}_proto PROPERTIES + set_target_properties(${PROTO_NAME}_proto PROPERTIES CXX_STANDARD_REQUIRED ON CXX_EXTENSIONS OFF POSITION_INDEPENDENT_CODE ON) @@ -393,6 +387,12 @@ endif() #$ ) target_compile_definitions(${PROTO_NAME}_proto PUBLIC ${OR_TOOLS_COMPILE_DEFINITIONS}) + if(MSVC AND BUILD_SHARED_LIBS) + target_compile_definitions(${PROTO_NAME}_proto INTERFACE "OR_PROTO_DLL=__declspec(dllimport)") + target_compile_definitions(${PROTO_NAME}_proto PRIVATE "OR_PROTO_DLL=__declspec(dllexport)") + else() + target_compile_definitions(${PROTO_NAME}_proto PUBLIC "OR_PROTO_DLL=") +endif() target_compile_options(${PROTO_NAME}_proto PUBLIC ${OR_TOOLS_COMPILE_OPTIONS}) target_link_libraries(${PROTO_NAME}_proto PUBLIC protobuf::libprotobuf ${PROTO_LINK_LIBRARIES}) add_library(${PROJECT_NAMESPACE}::${PROTO_NAME}_proto ALIAS ${PROTO_NAME}_proto)