Skip to content

Commit

Permalink
Merge pull request protocolbuffers#8948 from compnerd/split-check
Browse files Browse the repository at this point in the history
build: fix the support for CMake[<3.7]
  • Loading branch information
haberman authored Sep 1, 2021
2 parents 7b9b7fe + bf7a5e4 commit 768bc82
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion cmake/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,7 @@ else (protobuf_BUILD_SHARED_LIBS)
# Prior to CMake 3.15, the MSVC runtime library was pushed into the same flags
# making programmatic control difficult. Prefer the functionality in newer
# CMake versions when available.
if(CMAKE_VERSION VERSION_GREATER_EQUAL 3.15)
if(CMAKE_VERSION VERSION_GREATER 3.15 OR CMAKE_VERSION VERSION_EQUAL 3.15)
set(CMAKE_MSVC_RUNTIME_LIBRARY MultiThreaded$<$<CONFIG:Debug>:Debug>)
else()
# In case we are building static libraries, link also the runtime library statically
Expand Down

0 comments on commit 768bc82

Please sign in to comment.