stv0g/Criterion
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Fixed nanomsg static library not being picked up by win32 builds

Browse source
This commit is contained in:
Snaipe 2016-01-17 12:27:31 +01:00
parent 5591942df9
commit 215e8dc8fd
1 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
CMakeLists.txt
View file

@ -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)