From 7104d52466fdd78a051acb76c6a6d89638f9aba0 Mon Sep 17 00:00:00 2001 From: Henri DF Date: Mon, 7 Mar 2016 17:27:20 -0800 Subject: [PATCH] minor cmakefile cleanup --- CMakeLists.txt | 5 ----- userspace/digwatch/CMakeLists.txt | 3 +++ 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 2743e2e2..a3b4e43b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -30,13 +30,8 @@ set(SYSDIG_DIR ${PROJECT_SOURCE_DIR}/../sysdig) add_subdirectory(${SYSDIG_DIR} ${PROJECT_BINARY_DIR}/sysdig) -set(CURL_BUNDLE_DIR "${sysdig_BINARY_DIR}/curl-prefix/src/curl") -set(CURL_INCLUDE_DIR "${CURL_BUNDLE_DIR}/include/") -set(CURL_LIBRARIES "${CURL_BUNDLE_DIR}/lib/.libs/libcurl.a") - set(LUAJIT_INCLUDE_DIR "${sysdig_BINARY_DIR}/luajit-prefix/src/luajit/src") - message(STATUS "Using bundled curl in '${CURL_BUNDLE_DIR}'") message(STATUS "Using SSL for curl in '${CURL_SSL_OPTION}'") diff --git a/userspace/digwatch/CMakeLists.txt b/userspace/digwatch/CMakeLists.txt index 1736567c..f6117511 100644 --- a/userspace/digwatch/CMakeLists.txt +++ b/userspace/digwatch/CMakeLists.txt @@ -1,6 +1,9 @@ include_directories(${PROJECT_SOURCE_DIR}/../sysdig/userspace/libsinsp/third-party/jsoncpp) include_directories("${LUAJIT_INCLUDE_DIR}") +set(CURL_BUNDLE_DIR "${sysdig_BINARY_DIR}/curl-prefix/src/curl") +set(CURL_INCLUDE_DIR "${CURL_BUNDLE_DIR}/include/") + if(NOT APPLE) include_directories("${CURL_INCLUDE_DIR}") endif()