Skip to content

Commit

Permalink
fix protobuf dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
@halex2005
halex2005 committed Jun 6, 2016
1 parent 98eff3b commit f1d1cf7
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 9 deletions.
7 changes: 4 additions & 3 deletions protobuf-v2/protobuf-2.4.1.targets
View file
Expand Up @@ -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()
Expand Down Expand Up @@ -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})
Expand Down Expand Up @@ -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})
Expand Down
4 changes: 2 additions & 2 deletions protobuf-v2/protobuf-2.5.0.targets
View file
Expand Up @@ -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})
Expand Down Expand Up @@ -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})
Expand Down
4 changes: 2 additions & 2 deletions protobuf-v2/protobuf-2.6.0.targets
View file
Expand Up @@ -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})
Expand Down Expand Up @@ -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})
Expand Down
4 changes: 2 additions & 2 deletions protobuf-v2/protobuf-2.6.1.targets
View file
Expand Up @@ -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})
Expand Down Expand Up @@ -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})
Expand Down

0 comments on commit f1d1cf7

Please sign in to comment.