diff options
author | Feng Xiao <xfxyjwf@gmail.com> | 2015-08-03 10:19:32 -0700 |
---|---|---|
committer | Feng Xiao <xfxyjwf@gmail.com> | 2015-08-03 10:19:32 -0700 |
commit | dc80689af3951d078cb556588eece89dd6860c91 (patch) | |
tree | c83b4590f1b58eaf2285bb71ebf757fc723e13e4 /cmake | |
parent | b59bfcb30918382b3787db57d8caa803678f1ac5 (diff) | |
parent | c6095505dc0c1da8a85e4bd9c50917c6286c9724 (diff) | |
download | protobuf-dc80689af3951d078cb556588eece89dd6860c91.tar.gz protobuf-dc80689af3951d078cb556588eece89dd6860c91.tar.bz2 protobuf-dc80689af3951d078cb556588eece89dd6860c91.zip |
Merge pull request #653 from airtimemedia/master
Various compilation fixes
Diffstat (limited to 'cmake')
-rw-r--r-- | cmake/libprotobuf-lite.cmake | 1 | ||||
-rw-r--r-- | cmake/libprotobuf.cmake | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/cmake/libprotobuf-lite.cmake b/cmake/libprotobuf-lite.cmake index db55ea92..e323840a 100644 --- a/cmake/libprotobuf-lite.cmake +++ b/cmake/libprotobuf-lite.cmake @@ -24,6 +24,7 @@ set(libprotobuf_lite_files add_library(libprotobuf-lite ${libprotobuf_lite_files}) target_link_libraries(libprotobuf-lite ${CMAKE_THREAD_LIBS_INIT}) +target_include_directories(libprotobuf-lite PUBLIC ${protobuf_source_dir}/src) set_target_properties(libprotobuf-lite PROPERTIES COMPILE_DEFINITIONS LIBPROTOBUF_EXPORTS OUTPUT_NAME ${LIB_PREFIX}protobuf-lite) diff --git a/cmake/libprotobuf.cmake b/cmake/libprotobuf.cmake index 53ba3d3e..31fb1fb2 100644 --- a/cmake/libprotobuf.cmake +++ b/cmake/libprotobuf.cmake @@ -54,6 +54,7 @@ set(libprotobuf_files add_library(libprotobuf ${libprotobuf_lite_files} ${libprotobuf_files}) target_link_libraries(libprotobuf ${CMAKE_THREAD_LIBS_INIT} ${ZLIB_LIBRARIES}) +target_include_directories(libprotobuf PUBLIC ${protobuf_source_dir}/src) set_target_properties(libprotobuf PROPERTIES COMPILE_DEFINITIONS LIBPROTOBUF_EXPORTS OUTPUT_NAME ${LIB_PREFIX}protobuf) |