From 58486bfb170e01faed5460448d05ef2a80ff0018 Mon Sep 17 00:00:00 2001 From: Leonardo Di Donato Date: Thu, 19 Dec 2019 11:58:16 +0000 Subject: [PATCH] chore: better names for sysdig dependencies cmake Signed-off-by: Leonardo Di Donato --- cmake/modules/sysdig.cmake | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/cmake/modules/sysdig.cmake b/cmake/modules/sysdig.cmake index aa661ff7..d69894d9 100644 --- a/cmake/modules/sysdig.cmake +++ b/cmake/modules/sysdig.cmake @@ -11,19 +11,20 @@ # specific language governing permissions and limitations under the License. # -set(SYSDIG_WORKING_DIR "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules/sysdig-repo") -set(SYSDIG_REPO_DIR "${CMAKE_BINARY_DIR}/sysdig-repo") +set(SYSDIG_CMAKE_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules/sysdig-repo") +set(SYSDIG_CMAKE_WORKING_DIR "${CMAKE_BINARY_DIR}/sysdig-repo") -file(MAKE_DIRECTORY ${SYSDIG_REPO_DIR}) +file(MAKE_DIRECTORY ${SYSDIG_CMAKE_WORKING_DIR}) # cd /path/to/build && cmake /path/to/source -execute_process(COMMAND "${CMAKE_COMMAND}" ${SYSDIG_WORKING_DIR} WORKING_DIRECTORY ${SYSDIG_REPO_DIR}) +execute_process(COMMAND "${CMAKE_COMMAND}" ${SYSDIG_CMAKE_SOURCE_DIR} WORKING_DIRECTORY ${SYSDIG_CMAKE_WORKING_DIR}) # todo(leodido, fntlnz) > use the following one when CMake version will be >= 3.13 -# execute_process(COMMAND "${CMAKE_COMMAND}" -B ${SYSDIG_REPO_DIR} WORKING_DIRECTORY "${SYSDIG_WORKING_DIR}") +# execute_process(COMMAND "${CMAKE_COMMAND}" -B ${SYSDIG_CMAKE_WORKING_DIR} WORKING_DIRECTORY +# "${SYSDIG_CMAKE_SOURCE_DIR}") -execute_process(COMMAND "${CMAKE_COMMAND}" --build . WORKING_DIRECTORY "${SYSDIG_REPO_DIR}") -set(SYSDIG_SOURCE_DIR "${SYSDIG_REPO_DIR}/sysdig-prefix/src/sysdig") +execute_process(COMMAND "${CMAKE_COMMAND}" --build . WORKING_DIRECTORY "${SYSDIG_CMAKE_WORKING_DIR}") +set(SYSDIG_SOURCE_DIR "${SYSDIG_CMAKE_WORKING_DIR}/sysdig-prefix/src/sysdig") # jsoncpp set(JSONCPP_SRC "${SYSDIG_SOURCE_DIR}/userspace/libsinsp/third-party/jsoncpp")