diff options
| author | DDuarte <dnpd.dd@gmail.com> | 2014-11-04 14:19:51 +0000 |
|---|---|---|
| committer | DDuarte <dnpd.dd@gmail.com> | 2014-11-04 14:19:51 +0000 |
| commit | 62759880a7281328cbb14ac3510a211f1e919132 (patch) | |
| tree | eb426ab4e9aa5826f4e2180278cad6dc8d66c5f6 | |
| parent | 76419aadcddddb5d47f54f7d144e6cd9951b6408 (diff) | |
CMake: Improve FindZMQ on Windows
When ZMQ version is not found in the registry it will enumerate possible .lib names and try to find those
| -rw-r--r-- | cmake/macros/FindZMQ.cmake | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/cmake/macros/FindZMQ.cmake b/cmake/macros/FindZMQ.cmake index b0d7c56489f..c442f3d162c 100644 --- a/cmake/macros/FindZMQ.cmake +++ b/cmake/macros/FindZMQ.cmake @@ -49,8 +49,16 @@ if (MSVC) # Get Visual studio version number string(REGEX REPLACE "Visual Studio ([0-9]+).*" "\\1" ZMQ_VS_VERSION ${CMAKE_GENERATOR}) - # 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}) + list(APPEND ZMQ_LIBRARY_NAME "libzmq-v${ZMQ_VS_VERSION}0-mt-${ver}") + endforeach() + else() + # Format ZMQ library file name + set(ZMQ_LIBRARY_NAME "libzmq-v${ZMQ_VS_VERSION}0-mt-${ZMQ_NAME}") + endif() endif() find_library(ZMQ_LIBRARY |