diff options
| author | Brad King <brad.king@kitware.com> | 2023-07-07 14:29:11 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2023-07-07 14:29:30 (GMT) |
| commit | cd70f0f9eb305f7fe3028457a2e5974cc2a9dfab (patch) | |
| tree | 6a861e2bd183384599874b3ce1b88eeff2f37a4b /Modules | |
| parent | 64e66b4be310dd0a5cb2ea61092eb97b8ec4f574 (diff) | |
| parent | e978b3b8143b663b2ae0b206c2f95e093d13ddaa (diff) | |
| download | CMake-cd70f0f9eb305f7fe3028457a2e5974cc2a9dfab.zip CMake-cd70f0f9eb305f7fe3028457a2e5974cc2a9dfab.tar.gz CMake-cd70f0f9eb305f7fe3028457a2e5974cc2a9dfab.tar.bz2 | |
Merge topic 'findprotobuf-mingw' into release-3.27
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.cmake | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Modules/FindProtobuf.cmake b/Modules/FindProtobuf.cmake index b046fcc..b2567c0 100644 --- a/Modules/FindProtobuf.cmake +++ b/Modules/FindProtobuf.cmake @@ -556,7 +556,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" ) @@ -589,7 +589,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" ) @@ -627,7 +627,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" ) |