this repo has no description
0
fork

Configure Feed

Select the types of activity you want to include in your feed.

naett: Allow disabling when curl isn't available (#2432)

authored by

Rob Loach and committed by
GitHub
f83a769e ac16fcf0

+12 -5
-4
CMakeLists.txt
··· 40 40 set(BUILD_SDLGPU OFF) 41 41 endif() 42 42 43 - if(NOT RPI AND NOT N3DS AND NOT EMSCRIPTEN AND NOT BAREMETALPI) 44 - set(USE_NAETT TRUE) 45 - endif() 46 - 47 43 message("BUILD_SDLGPU: ${BUILD_SDLGPU}") 48 44 message("BUILD_TOUCH_INPUT: ${BUILD_TOUCH_INPUT}") 49 45 message("BUILD_STUB: ${BUILD_STUB}")
+12 -1
cmake/naett.cmake
··· 2 2 # naett 3 3 ################################ 4 4 5 + if(NOT RPI AND NOT N3DS AND NOT EMSCRIPTEN AND NOT BAREMETALPI) 6 + set(USE_NAETT TRUE) 7 + endif() 8 + 9 + # On Linux, naett requires curl. Disable naett if curl is not found. 10 + if(LINUX) 11 + find_package(CURL) 12 + if(NOT CURL_FOUND) 13 + set(USE_NAETT FALSE) 14 + endif() 15 + endif() 16 + 5 17 if(USE_NAETT) 6 18 add_library(naett STATIC ${THIRDPARTY_DIR}/naett/naett.c) 7 19 target_include_directories(naett PUBLIC ${THIRDPARTY_DIR}/naett) ··· 9 21 if(WIN32) 10 22 target_link_libraries(naett INTERFACE winhttp) 11 23 elseif(LINUX) 12 - find_package(CURL REQUIRED) 13 24 target_include_directories(naett PRIVATE ${CURL_INCLUDE_DIRS}) 14 25 target_link_libraries(naett ${CURL_LIBRARIES}) 15 26 endif()