Skip to content

Adopt CMake minimum version number #4789

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 9 additions & 14 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,10 +1,5 @@
# CMake build script for ZeroMQ

if(${CMAKE_HOST_SYSTEM_NAME} STREQUAL Darwin)
cmake_minimum_required(VERSION 3.0.2)
else()
cmake_minimum_required(VERSION 2.8.12)
endif()
cmake_minimum_required(VERSION 3.0...3.10)

project(ZeroMQ)

Expand Down Expand Up @@ -1340,15 +1335,15 @@ if(MSVC)
if(BUILD_SHARED)
# Whole Program Optimization flags. http://msdn.microsoft.com/en-us/magazine/cc301698.aspx
#
# "Finally, there's the subject of libraries. It's possible to create .LIB
# files with code in its IL form. The linker will happily work with these
# .LIB files. Be aware that these libraries will be tied to a specific
# version of the compiler and linker. If you distribute these libraries,
# you'll need to update them if Microsoft changes the format of IL in a
# "Finally, there's the subject of libraries. It's possible to create .LIB
# files with code in its IL form. The linker will happily work with these
# .LIB files. Be aware that these libraries will be tied to a specific
# version of the compiler and linker. If you distribute these libraries,
# you'll need to update them if Microsoft changes the format of IL in a
# future release."
#
# /GL and /LTCG can cause problems when libraries built with different
# versions of compiler are later linked into an executable while /LTCG is active.
#
# /GL and /LTCG can cause problems when libraries built with different
# versions of compiler are later linked into an executable while /LTCG is active.
# https://social.msdn.microsoft.com/Forums/vstudio/en-US/5c102025-c254-4f02-9a51-c775c6cc9f4b/problem-with-ltcg-when-building-a-static-library-in-vs2005?forum=vcgeneral
#
# For this reason, enable only when building a "Release" (e.g. non-DEBUG) DLL.
Expand Down
2 changes: 1 addition & 1 deletion tests/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# CMake build script for ZeroMQ tests
cmake_minimum_required(VERSION "2.8.1")
cmake_minimum_required(VERSION 3.0...3.10)

# On Windows: solution file will be called tests.sln
project(tests)
Expand Down
2 changes: 1 addition & 1 deletion unittests/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# CMake build script for ZeroMQ unit tests
cmake_minimum_required(VERSION "2.8.1")
cmake_minimum_required(VERSION 3.0...3.10)

set(unittests
unittest_ypipe
Expand Down
Loading