From f1d1cf7f1b50927c1da27d32950b52b88e6dab74 Mon Sep 17 00:00:00 2001 From: akharlov Date: Tue, 7 Jun 2016 00:45:16 +0500 Subject: [PATCH] fix protobuf dependencies --- protobuf-v2/protobuf-2.4.1.targets | 7 ++++--- protobuf-v2/protobuf-2.5.0.targets | 4 ++-- protobuf-v2/protobuf-2.6.0.targets | 4 ++-- protobuf-v2/protobuf-2.6.1.targets | 4 ++-- 4 files changed, 10 insertions(+), 9 deletions(-) diff --git a/protobuf-v2/protobuf-2.4.1.targets b/protobuf-v2/protobuf-2.4.1.targets index f07a644..2794064 100644 --- a/protobuf-v2/protobuf-2.4.1.targets +++ b/protobuf-v2/protobuf-2.4.1.targets @@ -87,7 +87,8 @@ SET (LIBPROTOBUF_SOURCES if (PROTOBUF_BUILD_SHARED_LIBS) add_library(libprotobuf SHARED ${LIBPROTOBUF_HEADERS} ${LIBPROTOBUF_SOURCES}) - target_compile_definitions(libprotobuf PRIVATE PROTOBUF_USE_DLLS LIBPROTOBUF_EXPORTS) + target_compile_definitions(libprotobuf PUBLIC PROTOBUF_USE_DLLS) + target_compile_definitions(libprotobuf PRIVATE LIBPROTOBUF_EXPORTS) else() add_library(libprotobuf STATIC ${LIBPROTOBUF_HEADERS} ${LIBPROTOBUF_SOURCES}) endif() @@ -126,7 +127,7 @@ SET (LIBPROTOBUF_LITE_SOURCES if (PROTOBUF_BUILD_SHARED_LIBS) add_library(libprotobuf-lite SHARED ${LIBPROTOBUF_LITE_HEADERS} ${LIBPROTOBUF_LITE_SOURCES}) - target_compile_definitions(libprotobuf PUBLIC PROTOBUF_USE_DLLS) + target_compile_definitions(libprotobuf-lite PUBLIC PROTOBUF_USE_DLLS) target_compile_definitions(libprotobuf-lite PRIVATE LIBPROTOBUF_EXPORTS) else() add_library(libprotobuf-lite STATIC ${LIBPROTOBUF_LITE_HEADERS} ${LIBPROTOBUF_LITE_SOURCES}) @@ -202,7 +203,7 @@ SET (LIBPROTOC_SOURCES if (PROTOBUF_BUILD_SHARED_LIBS) add_library(libprotoc SHARED ${LIBPROTOC_HEADERS} ${LIBPROTOC_SOURCES}) - target_compile_definitions(libprotobuf PUBLIC PROTOBUF_USE_DLLS) + target_compile_definitions(libprotoc PUBLIC PROTOBUF_USE_DLLS) target_compile_definitions(libprotoc PRIVATE LIBPROTOC_EXPORTS) else() add_library(libprotoc STATIC ${LIBPROTOC_HEADERS} ${LIBPROTOC_SOURCES}) diff --git a/protobuf-v2/protobuf-2.5.0.targets b/protobuf-v2/protobuf-2.5.0.targets index 9f87ebc..4bcbba8 100644 --- a/protobuf-v2/protobuf-2.5.0.targets +++ b/protobuf-v2/protobuf-2.5.0.targets @@ -143,7 +143,7 @@ SET (LIBPROTOBUF_LITE_SOURCES if (PROTOBUF_BUILD_SHARED_LIBS) add_library(libprotobuf-lite SHARED ${LIBPROTOBUF_LITE_HEADERS} ${LIBPROTOBUF_LITE_SOURCES}) - target_compile_definitions(libprotobuf PUBLIC PROTOBUF_USE_DLLS) + target_compile_definitions(libprotobuf-lite PUBLIC PROTOBUF_USE_DLLS) target_compile_definitions(libprotobuf-lite PRIVATE LIBPROTOBUF_EXPORTS) else() add_library(libprotobuf-lite STATIC ${LIBPROTOBUF_LITE_HEADERS} ${LIBPROTOBUF_LITE_SOURCES}) @@ -222,7 +222,7 @@ SET (LIBPROTOC_SOURCES if (PROTOBUF_BUILD_SHARED_LIBS) add_library(libprotoc SHARED ${LIBPROTOC_HEADERS} ${LIBPROTOC_SOURCES}) - target_compile_definitions(libprotobuf PUBLIC PROTOBUF_USE_DLLS) + target_compile_definitions(libprotoc PUBLIC PROTOBUF_USE_DLLS) target_compile_definitions(libprotoc PRIVATE LIBPROTOC_EXPORTS) else() add_library(libprotoc STATIC ${LIBPROTOC_HEADERS} ${LIBPROTOC_SOURCES}) diff --git a/protobuf-v2/protobuf-2.6.0.targets b/protobuf-v2/protobuf-2.6.0.targets index 12543a4..615d99e 100644 --- a/protobuf-v2/protobuf-2.6.0.targets +++ b/protobuf-v2/protobuf-2.6.0.targets @@ -145,7 +145,7 @@ SET (LIBPROTOBUF_LITE_SOURCES if (PROTOBUF_BUILD_SHARED_LIBS) add_library(libprotobuf-lite SHARED ${LIBPROTOBUF_LITE_HEADERS} ${LIBPROTOBUF_LITE_SOURCES}) - target_compile_definitions(libprotobuf PUBLIC PROTOBUF_USE_DLLS) + target_compile_definitions(libprotobuf-lite PUBLIC PROTOBUF_USE_DLLS) target_compile_definitions(libprotobuf-lite PRIVATE LIBPROTOBUF_EXPORTS) else() add_library(libprotobuf-lite STATIC ${LIBPROTOBUF_LITE_HEADERS} ${LIBPROTOBUF_LITE_SOURCES}) @@ -234,7 +234,7 @@ SET (LIBPROTOC_SOURCES if (PROTOBUF_BUILD_SHARED_LIBS) add_library(libprotoc SHARED ${LIBPROTOC_HEADERS} ${LIBPROTOC_SOURCES}) - target_compile_definitions(libprotobuf PUBLIC PROTOBUF_USE_DLLS) + target_compile_definitions(libprotoc PUBLIC PROTOBUF_USE_DLLS) target_compile_definitions(libprotoc PRIVATE LIBPROTOC_EXPORTS) else() add_library(libprotoc STATIC ${LIBPROTOC_HEADERS} ${LIBPROTOC_SOURCES}) diff --git a/protobuf-v2/protobuf-2.6.1.targets b/protobuf-v2/protobuf-2.6.1.targets index 12543a4..615d99e 100644 --- a/protobuf-v2/protobuf-2.6.1.targets +++ b/protobuf-v2/protobuf-2.6.1.targets @@ -145,7 +145,7 @@ SET (LIBPROTOBUF_LITE_SOURCES if (PROTOBUF_BUILD_SHARED_LIBS) add_library(libprotobuf-lite SHARED ${LIBPROTOBUF_LITE_HEADERS} ${LIBPROTOBUF_LITE_SOURCES}) - target_compile_definitions(libprotobuf PUBLIC PROTOBUF_USE_DLLS) + target_compile_definitions(libprotobuf-lite PUBLIC PROTOBUF_USE_DLLS) target_compile_definitions(libprotobuf-lite PRIVATE LIBPROTOBUF_EXPORTS) else() add_library(libprotobuf-lite STATIC ${LIBPROTOBUF_LITE_HEADERS} ${LIBPROTOBUF_LITE_SOURCES}) @@ -234,7 +234,7 @@ SET (LIBPROTOC_SOURCES if (PROTOBUF_BUILD_SHARED_LIBS) add_library(libprotoc SHARED ${LIBPROTOC_HEADERS} ${LIBPROTOC_SOURCES}) - target_compile_definitions(libprotobuf PUBLIC PROTOBUF_USE_DLLS) + target_compile_definitions(libprotoc PUBLIC PROTOBUF_USE_DLLS) target_compile_definitions(libprotoc PRIVATE LIBPROTOC_EXPORTS) else() add_library(libprotoc STATIC ${LIBPROTOC_HEADERS} ${LIBPROTOC_SOURCES})