Use variables set by find_package(CURL) (awslabs#3)

marcomagdy · web-flow · commit 248d2606261c · 2018-11-29T14:25:33.000-08:00
* Use variables set by find_package(CURL)

Without explicitly linking to ${CURL_LIBRARIES}, linker will always
pick up libcurl from the system path, which might not be what we want
if we built libcurl from source and installed it elsewhere, for example.

* Remove aws-cpp-sdk-lambda patch

This was needed when the custom runtime feature was not yet public.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -33,7 +33,8 @@ target_include_directories(${PROJECT_NAME} PUBLIC
     $<INSTALL_INTERFACE:include>)
 
 find_package(CURL REQUIRED)
-target_link_libraries(${PROJECT_NAME} PRIVATE curl)
+target_link_libraries(${PROJECT_NAME} PRIVATE ${CURL_LIBRARIES})
+target_include_directories(${PROJECT_NAME} PRIVATE ${CURL_INCLUDE_DIRS})
 
 if(HAVE_BACKTRACE)
     target_compile_definitions(${PROJECT_NAME} PRIVATE -DHAVE_BACKTRACE)
@@ -67,7 +68,6 @@ endif()
 if (ENABLE_TESTS)
     enable_testing()
     add_subdirectory(tests)
-    add_subdirectory(tests/resources)
 endif()
 
 # installation
diff --git a/ci/codebuild/build-cpp-sdk.sh b/ci/codebuild/build-cpp-sdk.sh
@@ -5,7 +5,6 @@ set -euo pipefail
 # build the AWS C++ SDK
 cd /aws-sdk-cpp
 git pull
-git apply $CODEBUILD_SRC_DIR/ci/codebuild/lambda.patch
 mkdir build
 cd build
 cmake .. -GNinja -DBUILD_ONLY="lambda" \
diff --git a/ci/codebuild/lambda.patch b/ci/codebuild/lambda.patch
