aboutsummaryrefslogtreecommitdiff
path: root/cmake/macros
diff options
context:
space:
mode:
authorShauren <shauren.trinity@gmail.com>2016-01-21 17:50:37 +0100
committerShauren <shauren.trinity@gmail.com>2016-01-21 17:50:37 +0100
commitf4ebab2a73f279a848a2c74069305ce8a4501fe6 (patch)
treed81c578ea0d6212456f0f655f9e350f78b96844f /cmake/macros
parent575d5f5ff803790bc097d16a3f1e86f3eda5318e (diff)
Buildsystem: Try picking up zmq lib for VS 2013 if using VS 2015
Diffstat (limited to 'cmake/macros')
-rw-r--r--cmake/macros/FindZMQ.cmake5
1 files changed, 5 insertions, 0 deletions
diff --git a/cmake/macros/FindZMQ.cmake b/cmake/macros/FindZMQ.cmake
index d538257e3b3..4f415c539bf 100644
--- a/cmake/macros/FindZMQ.cmake
+++ b/cmake/macros/FindZMQ.cmake
@@ -49,6 +49,11 @@ if (MSVC)
# Get Visual studio version number
string(REGEX REPLACE "Visual Studio ([0-9]+).*" "\\1" ZMQ_VS_VERSION ${CMAKE_GENERATOR})
+ # HACK - zmq doesnt ship libs for VS 2015
+ if (${ZMQ_VS_VERSION} EQUAL 14)
+ set(ZMQ_VS_VERSION 12)
+ endif()
+
if (${ZMQ_NAME} MATCHES "registry") # if key was not found, the string "registry" is returned
set(_ZMQ_VERSIONS "4_0_4" "4_0_3" "4_0_2" "4_0_1" "4_0_0" "3_2_5" "3_2_4" "3_2_3" "3_2_2" "3_2_1" "3_2_0" "3_1_0")
set(ZMQ_LIBRARY_NAME)