Skip to content

L
libzmq
Commit 673bb506 authored by Luca Boccassi's avatar Luca Boccassi Committed by GitHub
Browse files
Options

Merge pull request #2318 from kurdybacha/static_file_fix 

CMake static library output does not match ZeroMQ Config.
parents c031b0c4 877419e9
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
CMakeLists.txt
View file @ 673bb506
......@@ -908,10 +908,10 @@ if (MSVC)
get_property(libzmq_pf TARGET libzmq PROPERTY ${U_CMAKE_BUILD_TYPE}_POSTFIX)
set(libzmq_file libzmq${libzmq_pf}${CMAKE_LINK_LIBRARY_SUFFIX})
get_property(libzmq_static_pf TARGET libzmq-static PROPERTY ${U_CMAKE_BUILD_TYPE}_POSTFIX)
set(libzmq_static_file libzmq-static${libzmq_static_pf}${CMAKE_LINK_LIBRARY_SUFFIX})
set(libzmq_static_file libzmq${libzmq_static_pf}${CMAKE_LINK_LIBRARY_SUFFIX})
else()
set(libzmq_file libzmq${CMAKE_SHARED_LIBRARY_SUFFIX})
set(libzmq_static_file libzmq-static${CMAKE_STATIC_LIBRARY_SUFFIX})
set(libzmq_static_file libzmq${CMAKE_STATIC_LIBRARY_SUFFIX})
endif()
# GNUInstallDirs "DATADIR" wrong here; CMake search path wants "share".
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment