mirror of
https://github.com/zeromq/libzmq.git
synced 2024-12-27 15:41:05 +08:00
Merge pull request #2318 from kurdybacha/static_file_fix
CMake static library output does not match ZeroMQ Config.
This commit is contained in:
commit
673bb506cf
@ -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".
|
||||
|
Loading…
x
Reference in New Issue
Block a user