summaryrefslogtreecommitdiffstats
path: root/Modules
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2023-07-07 14:29:11 (GMT)
committerKitware Robot <kwrobot@kitware.com>2023-07-07 14:29:31 (GMT)
commit619d850886bc9158acbb3aa325b867bb2331c3c3 (patch)
tree38e93bb4910b1ded9c1200b5a815a73b506ddbf6 /Modules
parentd2ff10d1f958b454b810871982acf475edab5aef (diff)
parente978b3b8143b663b2ae0b206c2f95e093d13ddaa (diff)
downloadCMake-619d850886bc9158acbb3aa325b867bb2331c3c3.zip
CMake-619d850886bc9158acbb3aa325b867bb2331c3c3.tar.gz
CMake-619d850886bc9158acbb3aa325b867bb2331c3c3.tar.bz2
Merge topic 'findprotobuf-mingw'
e978b3b814 FindProtobuf: Fix linking to shared libraries on MinGW Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !8609
Diffstat (limited to 'Modules')
-rw-r--r--Modules/FindProtobuf.cmake6
1 files changed, 3 insertions, 3 deletions
diff --git a/Modules/FindProtobuf.cmake b/Modules/FindProtobuf.cmake
index 3455412..0b9bd1f 100644
--- a/Modules/FindProtobuf.cmake
+++ b/Modules/FindProtobuf.cmake
@@ -655,7 +655,7 @@ if(Protobuf_INCLUDE_DIR)
INTERFACE_COMPILE_FEATURES cxx_std_11
)
endif()
- if (MSVC AND NOT Protobuf_USE_STATIC_LIBS)
+ if (WIN32 AND NOT Protobuf_USE_STATIC_LIBS)
set_property(TARGET protobuf::libprotobuf APPEND PROPERTY
INTERFACE_COMPILE_DEFINITIONS "PROTOBUF_USE_DLLS"
)
@@ -688,7 +688,7 @@ if(Protobuf_INCLUDE_DIR)
set_target_properties(protobuf::libprotobuf-lite PROPERTIES
IMPORTED_LOCATION_DEBUG "${Protobuf_LITE_LIBRARY_DEBUG}")
endif()
- if (MSVC AND NOT Protobuf_USE_STATIC_LIBS)
+ if (WIN32 AND NOT Protobuf_USE_STATIC_LIBS)
set_property(TARGET protobuf::libprotobuf-lite APPEND PROPERTY
INTERFACE_COMPILE_DEFINITIONS "PROTOBUF_USE_DLLS"
)
@@ -726,7 +726,7 @@ if(Protobuf_INCLUDE_DIR)
INTERFACE_COMPILE_FEATURES cxx_std_11
)
endif()
- if (MSVC AND NOT Protobuf_USE_STATIC_LIBS)
+ if (WIN32 AND NOT Protobuf_USE_STATIC_LIBS)
set_property(TARGET protobuf::libprotoc APPEND PROPERTY
INTERFACE_COMPILE_DEFINITIONS "PROTOBUF_USE_DLLS"
)