Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-20 01:15:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'findzmq' into '4.3.4'

Browse Source 
Corrected issues with ZeroMQ and VS2015

Sync FindZMQ.cmake, also fix CMake unable to find ZeroMQ if Visual Studio 2015 is used.

See merge request !3
This commit is contained in:
Aokromes
2016-01-10 21:51:09 +00:00
parent cabf159308 5723f54a44
commit 706b5625fe
1 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
cmake/macros/FindZMQ.cmake
View File

@@ -47,10 +47,22 @@ if (MSVC)
string(REGEX REPLACE "\\." "_" ZMQ_NAME ${ZMQ_NAME})
# Get Visual studio version number
string(REGEX REPLACE "Visual Studio ([0-9]+).*" "\\1" ZMQ_VS_VERSION ${CMAKE_GENERATOR})
set(_VS_VERSIONS "140" "120")
# Format ZMQ library file name
set(ZMQ_LIBRARY_NAME "libzmq-v${ZMQ_VS_VERSION}0-mt-${ZMQ_NAME}")
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)
foreach(ver ${_ZMQ_VERSIONS})
foreach(vs ${_VS_VERSIONS})
list(APPEND ZMQ_LIBRARY_NAME "libzmq-v${vs}-mt-${ver}")
endforeach()
endforeach()
else()
# Format ZMQ library file name
foreach(vs ${_VS_VERSIONS})
set(ZMQ_LIBRARY_NAME "libzmq-v${vs}-mt-${ZMQ_NAME}")
endforeach()
endif()
endif()
find_library(ZMQ_LIBRARY
@@ -64,7 +76,7 @@ find_library(ZMQ_LIBRARY
"${ZMQ_ROOT_DIR}/lib"
)
if (ZMQ_INCLUDE_DIR AND ZMQ_LIBRARY)
if (ZMQ_INCLUDE_DIR AND ZMQ_LIBRARY AND NOT ZMQ_LIBRARY-NOTFOUND)
set(ZMQ_FOUND 1)
message(STATUS "Found ZMQ library: ${ZMQ_LIBRARY}")
message(STATUS "Found ZMQ headers: ${ZMQ_INCLUDE_DIR}")