From 80cbddde7b5c54eed86ed554ecb3a4839e155db3 Mon Sep 17 00:00:00 2001 From: Jeff Becker Date: Thu, 26 Dec 2019 13:06:02 -0500 Subject: [PATCH] fixups for review --- cmake/unix.cmake | 2 +- llarp/CMakeLists.txt | 4 ++-- readme.md | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/cmake/unix.cmake b/cmake/unix.cmake index a579f855d..7b2d0c7f9 100644 --- a/cmake/unix.cmake +++ b/cmake/unix.cmake @@ -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() diff --git a/llarp/CMakeLists.txt b/llarp/CMakeLists.txt index 96ec52b6f..05bf7d979 100644 --- a/llarp/CMakeLists.txt +++ b/llarp/CMakeLists.txt @@ -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") diff --git a/readme.md b/readme.md index 4c389b50e..9a82e8628 100644 --- a/readme.md +++ b/readme.md @@ -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)