summaryrefslogtreecommitdiff
path: root/thirdparty
diff options
context:
space:
mode:
authorMark Janes <mark.a.janes@intel.com>2017-03-03 13:37:04 -0800
committerMark Janes <mark.a.janes@intel.com>2017-06-19 14:04:50 -0700
commit6defdba362e9dcfe072723fec43f542e0b152264 (patch)
tree94451e1f6259ba0d01101651c86de75dd940f626 /thirdparty
parent87c0db4eac5f8ed86cd013f698354adf23e0331e (diff)
CMake: fix install target
FrameRetrace incorrectly installed it's version protocol buffers libraries, which affected other builds that link against system libs. Also, FrameRetrace binaries were not installed together with ApiTrace. Reported-by: Eero Tamminen <eero.t.tamminen@intel.com>
Diffstat (limited to 'thirdparty')
-rw-r--r--thirdparty/protobuf/cmake/CMakeLists.txt3
1 files changed, 2 insertions, 1 deletions
diff --git a/thirdparty/protobuf/cmake/CMakeLists.txt b/thirdparty/protobuf/cmake/CMakeLists.txt
index 06b47f77..74a6f666 100644
--- a/thirdparty/protobuf/cmake/CMakeLists.txt
+++ b/thirdparty/protobuf/cmake/CMakeLists.txt
@@ -165,7 +165,8 @@ if (protobuf_BUILD_TESTS)
include(tests.cmake)
endif (protobuf_BUILD_TESTS)
-include(install.cmake)
+# do not install protobuf libraries: FrameRetrace links against them statically
+# include(install.cmake)
if (protobuf_BUILD_EXAMPLES)
include(examples.cmake)