diff --git a/README.md b/README.md index 156b921..676e6e4 100644 --- a/README.md +++ b/README.md @@ -38,7 +38,7 @@ To build with tests add the following argument when run cmake: cmake -DCMAKE_BUILD_TYPE=Release -A x64 .. cmake --build . --target ALL_BUILD --config Release ``` - +If Libsodium issues arise please try to open MSVS project and build for x64 located : cscrypto\third-party\libsodium\builds\msvc ### Unix: ```sh $ git clone https://github.com/CREDITSCOM/cscrypto.git diff --git a/third-party/CMakeLists.txt b/third-party/CMakeLists.txt index 1341f5f..80bb5e6 100644 --- a/third-party/CMakeLists.txt +++ b/third-party/CMakeLists.txt @@ -63,18 +63,18 @@ endif() add_library(libsodium STATIC IMPORTED GLOBAL) set_property(TARGET libsodium PROPERTY IMPORTED_LOCATION_RELEASE - ${libsodium_dir}/Build/Release/x64/${lb_lib_folder}/libsodium${CMAKE_STATIC_LIBRARY_SUFFIX}) + ${libsodium_dir}/bin/x64/Release/v${MSVC_TOOLSET_VERSION}/static/libsodium${CMAKE_STATIC_LIBRARY_SUFFIX}) set_property(TARGET libsodium PROPERTY IMPORTED_LOCATION_RELWITHDEBINFO - ${libsodium_dir}/Build/Release/x64/${lb_lib_folder}/libsodium${CMAKE_STATIC_LIBRARY_SUFFIX}) + ${libsodium_dir}/bin/x64/Release/v${MSVC_TOOLSET_VERSION}/static/libsodium${CMAKE_STATIC_LIBRARY_SUFFIX}) set_property(TARGET libsodium PROPERTY IMPORTED_LOCATION_DEBUG - ${libsodium_dir}/Build/Debug/x64/${lb_lib_folder}/libsodium${CMAKE_STATIC_LIBRARY_SUFFIX}) + ${libsodium_dir}/bin/x64/Debug/v${MSVC_TOOLSET_VERSION}/static/libsodium${CMAKE_STATIC_LIBRARY_SUFFIX}) set_property(TARGET libsodium PROPERTY IMPORTED_LOCATION_RELSPAM - ${libsodium_dir}/Build/Release/x64/${lb_lib_folder}/libsodium${CMAKE_STATIC_LIBRARY_SUFFIX}) + ${libsodium_dir}/bin/x64/Release/v${MSVC_TOOLSET_VERSION}/static/libsodium${CMAKE_STATIC_LIBRARY_SUFFIX}) set_property(TARGET libsodium PROPERTY IMPORTED_LOCATION_RELMONITOR - ${libsodium_dir}/Build/Release/x64/${lb_lib_folder}/libsodium${CMAKE_STATIC_LIBRARY_SUFFIX}) + ${libsodium_dir}/bin/x64/Release/v${MSVC_TOOLSET_VERSION}/static/libsodium${CMAKE_STATIC_LIBRARY_SUFFIX}) set_property(TARGET libsodium PROPERTY IMPORTED_LOCATION_RELWALLET - ${libsodium_dir}/Build/Release/x64/${lb_lib_folder}/libsodium${CMAKE_STATIC_LIBRARY_SUFFIX}) + ${libsodium_dir}/bin/x64/Release/v${MSVC_TOOLSET_VERSION}/static/libsodium${CMAKE_STATIC_LIBRARY_SUFFIX}) add_subdirectory(blake2) add_subdirectory(base58)