fixups for review

pull/1005/head
Jeff Becker 4 years ago
parent 7ffc786bce
commit 80cbddde7b
No known key found for this signature in database
GPG Key ID: F357B3B42F6F9B05

@ -18,7 +18,7 @@ if(NOT IOS AND NOT ANDROID AND NOT WIN32)
set(CURL_CA_PATH none)
message(STATUS "using local curl: ${LIBCURL_ROOT}")
add_subdirectory(${LIBCURL_ROOT})
set(CURL_INCLUDE_DIR ${LIBCURL_ROOT}/include)
set(CURL_INCLUDE_DIRS ${LIBCURL_ROOT}/include)
set(CURL_LIBRARIES libcurl)
set(CURL_FOUND TRUE)
else()

@ -63,7 +63,7 @@ add_library(${UTIL_LIB} STATIC ${LIB_UTIL_SRC})
add_dependencies(${UTIL_LIB} genversion)
target_include_directories(${UTIL_LIB} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR} ${PROJECT_SOURCE_DIR}/include ${CURL_INCLUDE_DIR})
target_include_directories(${UTIL_LIB} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR} ${PROJECT_SOURCE_DIR}/include ${CURL_INCLUDE_DIRS})
if(ANDROID)
set(LOG_LIB log)
endif()
@ -253,7 +253,7 @@ if(TESTNET)
endif()
add_library(${STATIC_LIB} STATIC ${LIB_SRC})
target_include_directories(${STATIC_LIB} PUBLIC ${CURL_INCLUDE_DIR})
target_include_directories(${STATIC_LIB} PUBLIC ${CURL_INCLUDE_DIRS})
target_link_libraries(${STATIC_LIB} PUBLIC cxxopts ${ABYSS_LIB} ${PLATFORM_LIB} ${UTIL_LIB} ${CRYPTOGRAPHY_LIB} ${CURL_LIBRARIES})
if(${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD")

@ -98,7 +98,7 @@ this puts the built packages in `../`
static native optimized:
$ make static STATIC_LINK=ON DOWNLOAD_SODIUM=ON
$ make static STATIC_LINK=ON
cross compile fully static armhf (rpi 2 and up)

Loading…
Cancel
Save