summaryrefslogtreecommitdiffstats
path: root/Modules
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2019-07-08 15:28:18 (GMT)
committerKitware Robot <kwrobot@kitware.com>2019-07-08 15:28:27 (GMT)
commita6a698aafb8fea7191669d9e9ca2bce0fb3be73f (patch)
tree4508cfec42adbde8c3aa79e95c07e4f841b1dbf4 /Modules
parentbf7f5d0a22c735cd1ebb3e40b8e9c0f6140c6d6a (diff)
parent59a30f2acfdf4bd9d9bd4fffbb9945a372957499 (diff)
downloadCMake-a6a698aafb8fea7191669d9e9ca2bce0fb3be73f.zip
CMake-a6a698aafb8fea7191669d9e9ca2bce0fb3be73f.tar.gz
CMake-a6a698aafb8fea7191669d9e9ca2bce0fb3be73f.tar.bz2
Merge topic 'pb-cxx11'
59a30f2acf FindProtobuf: libprotoc also needs C++11 194adaf985 Tests: require C++11 for some protobuf tests Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3503
Diffstat (limited to 'Modules')
-rw-r--r--Modules/FindProtobuf.cmake5
1 files changed, 5 insertions, 0 deletions
diff --git a/Modules/FindProtobuf.cmake b/Modules/FindProtobuf.cmake
index 085e96c..670352c 100644
--- a/Modules/FindProtobuf.cmake
+++ b/Modules/FindProtobuf.cmake
@@ -582,6 +582,11 @@ if(Protobuf_INCLUDE_DIR)
set_target_properties(protobuf::libprotoc PROPERTIES
IMPORTED_LOCATION_DEBUG "${Protobuf_PROTOC_LIBRARY_DEBUG}")
endif()
+ if (Protobuf_VERSION VERSION_GREATER_EQUAL "3.6")
+ set_property(TARGET protobuf::libprotoc APPEND PROPERTY
+ INTERFACE_COMPILE_FEATURES cxx_std_11
+ )
+ endif()
if(UNIX AND TARGET Threads::Threads)
set_property(TARGET protobuf::libprotoc APPEND PROPERTY
INTERFACE_LINK_LIBRARIES Threads::Threads)