From 443a9676e110349fbecaac8014d8605f8dd5c603 Mon Sep 17 00:00:00 2001 From: Casey Link Date: Tue, 18 Nov 2014 14:22:04 +0100 Subject: [PATCH] install the full protobuf library required to access text_format (needed by stockpiles plugin) --- depends/protobuf/CMakeLists.txt | 5 ++++- plugins/Plugins.cmake | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/depends/protobuf/CMakeLists.txt b/depends/protobuf/CMakeLists.txt index 5034f00f4..0544f5d35 100644 --- a/depends/protobuf/CMakeLists.txt +++ b/depends/protobuf/CMakeLists.txt @@ -222,7 +222,10 @@ SET_TARGET_PROPERTIES(protobuf-lite PROPERTIES COMPILE_DEFINITIONS LIBPROTOBUF_E TARGET_LINK_LIBRARIES(protobuf ${CMAKE_THREAD_LIBS_INIT} ${ZLIB_LIBRARIES}) TARGET_LINK_LIBRARIES(protobuf-lite ${CMAKE_THREAD_LIBS_INIT} ${ZLIB_LIBRARIES}) -install(TARGETS protobuf-lite +#install(TARGETS protobuf-lite + #LIBRARY DESTINATION ${DFHACK_LIBRARY_DESTINATION} + #RUNTIME DESTINATION ${DFHACK_LIBRARY_DESTINATION}) +install(TARGETS protobuf LIBRARY DESTINATION ${DFHACK_LIBRARY_DESTINATION} RUNTIME DESTINATION ${DFHACK_LIBRARY_DESTINATION}) diff --git a/plugins/Plugins.cmake b/plugins/Plugins.cmake index e5d0c3bae..9465bfeaf 100644 --- a/plugins/Plugins.cmake +++ b/plugins/Plugins.cmake @@ -83,7 +83,7 @@ MACRO(DFHACK_PLUGIN) LIST(LENGTH PLUGIN_PROTOBUFS NUM_PROTO) IF(NUM_PROTO) - TARGET_LINK_LIBRARIES(${PLUGIN_NAME} dfhack protobuf-lite ${PLUGIN_LINK_LIBRARIES}) + TARGET_LINK_LIBRARIES(${PLUGIN_NAME} dfhack protobuf ${PLUGIN_LINK_LIBRARIES}) IF(UNIX) SET_TARGET_PROPERTIES(${PLUGIN_NAME} PROPERTIES COMPILE_FLAGS "-include Export.h") ELSE() @@ -104,4 +104,4 @@ MACRO(DFHACK_PLUGIN) install(TARGETS ${PLUGIN_NAME} LIBRARY DESTINATION ${DFHACK_PLUGIN_DESTINATION} RUNTIME DESTINATION ${DFHACK_PLUGIN_DESTINATION}) -ENDMACRO(DFHACK_PLUGIN) \ No newline at end of file +ENDMACRO(DFHACK_PLUGIN)