diff --git a/3rdParty/curl/CMakeLists.txt b/3rdParty/curl/CMakeLists.txt index 78fc7ae..8ca4e98 100644 --- a/3rdParty/curl/CMakeLists.txt +++ b/3rdParty/curl/CMakeLists.txt @@ -33,11 +33,12 @@ function(LinkCurl TARGET) set(CURL_DEPS_INSTALL ${CMAKE_BINARY_DIR}/deps_curl) target_include_directories(${TARGET} PUBLIC ${CURL_DEPS_INSTALL}/INSTALL/include) target_link_directories(${TARGET} PUBLIC ${CURL_DEPS_INSTALL}/INSTALL/lib) + message("Using CURL install dir: ${CURL_DEPS_INSTALL}/INSTALL/include") if (APPLE) target_link_libraries(${TARGET} PUBLIC curl) elseif (WIN32) - target_link_libraries(${TARGET} PUBLIC ${OPENSSL_SSL_LIBRARY} ${OPENSSL_CRYPTO_LIBRARY}) + target_link_libraries(${TARGET} PUBLIC curl ${OPENSSL_SSL_LIBRARY} ${OPENSSL_CRYPTO_LIBRARY}) else () target_link_libraries(${TARGET} PUBLIC crypto ssl curl) endif () diff --git a/openVulkanoCpp/Host/WebResourceLoader.cpp b/openVulkanoCpp/Host/WebResourceLoader.cpp index 10ee494..d5ade2b 100644 --- a/openVulkanoCpp/Host/WebResourceLoader.cpp +++ b/openVulkanoCpp/Host/WebResourceLoader.cpp @@ -11,8 +11,12 @@ #include #include + #if __has_include("curl/curl.h") -#include + #include +#else + #pragma message ("Missing curl.h even though HAS_CURL is set") + #undef HAS_CURL #endif namespace OpenVulkano