diff --git a/CMakeLists.txt b/CMakeLists.txt index ca4a8e277..aef613ee3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -206,7 +206,7 @@ if (ZMQ_PREFIX STREQUAL "bundled") ) file(GLOB_RECURSE BUILT_LIBS "${bundled_libsodium_SOURCE_DIR}/**/libsodium.lib") message(STATUS "built ${BUILT_LIBS}") - list(GET ${BUILT_LIBS} 0 BUILT_LIB) + list(GET ${BUILT_LIBS} 1 BUILT_LIB) message(STATUS "copy ${BUILT_LIB} ${libsodium_lib}") file(COPY_FILE ${BUILT_LIB} ${libsodium_lib}) else() diff --git a/cmake/Findsodium.cmake b/cmake/Findsodium.cmake index d1abe8c8e..7e6cf1c90 100644 --- a/cmake/Findsodium.cmake +++ b/cmake/Findsodium.cmake @@ -20,14 +20,14 @@ if (NOT SODIUM_FOUND) find_path( SODIUM_INCLUDE_DIRS NAMES sodium.h - PATH ${BUNDLE_DIR} ${bundled_libsodium_include} + PATH ${bundled_libsodium_include} ) message(STATUS "Found ${SODIUM_INCLUDE_DIRS} in ${BUNDLE_DIR}, ${bundled_libsodium_include}") # TODO: find bundled sodium on msvc find_library( SODIUM_LIBRARIES NAMES libsodium.a libsodium.lib - PATH ${BUNDLE_DIR} + PATH ${BUNDLE_DIR}/lib ) message(STATUS "Found ${SODIUM_LIBRARIES} in ${BUNDLE_DIR}") if (SODIUM_LIBRARIES)