try to find bundled libsodium.lib

zeromq · Feb 15, 2024 · dac8922 · dac8922
1 parent 91fee8c
commit dac8922
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git 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
@@ -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)