From 215e8dc8fd343ce2d165e68296feae5144757760 Mon Sep 17 00:00:00 2001 From: Snaipe Date: Sun, 17 Jan 2016 12:27:31 +0100 Subject: [PATCH] Fixed nanomsg static library not being picked up by win32 builds --- CMakeLists.txt | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 6b740d3..32b92d2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -300,7 +300,17 @@ include_directories(include src) add_library(criterion SHARED ${SOURCE_FILES} ${INTERFACE_FILES}) add_dependencies(criterion nanomsg) -target_link_libraries(criterion csptr libnanomsg.a pthread) +target_link_libraries(criterion csptr) + +if (WIN32) + if (MSVC) + target_link_libraries(criterion ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_BUILD_TYPE}/nanomsg.lib) + else () + target_link_libraries(criterion ${CMAKE_CURRENT_BINARY_DIR}/dependencies/nanomsg-patched/nanomsg.lib) + endif() +else () + target_link_libraries(criterion ${CMAKE_CURRENT_BINARY_DIR}/nanomsg-patched/lib/libnanomsg.a) +endif () if (NOT WIN32) target_link_libraries(criterion csptr pthread)