diff --git a/CMakeLists.txt b/CMakeLists.txt index 5c36ded022e..753fa2fca87 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -144,7 +144,7 @@ else() INSTALL_COMMAND "") endif() -set(JSONCPP_SRC "${SYSDIG_DIR}/userspace/libsinsp/third-party/jsoncpp") +set(JSONCPP_SRC "${PROJECT_SOURCE_DIR}/../sysdig/userspace/libsinsp/third-party/jsoncpp") set(JSONCPP_INCLUDE "${JSONCPP_SRC}") set(JSONCPP_LIB_SRC "${JSONCPP_SRC}/jsoncpp.cpp") @@ -608,18 +608,18 @@ add_subdirectory(docker) # Add path for custom CMake modules used to build dependencies from Sysdig (libscap, libsinsp) list(APPEND CMAKE_MODULE_PATH - "${SYSDIG_DIR}/cmake/modules") + "${PROJECT_SOURCE_DIR}/../sysdig/cmake/modules") # Add path for custom CMake modules list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules") if(CMAKE_SYSTEM_NAME MATCHES "Linux") - add_subdirectory("${SYSDIG_DIR}/driver" "${PROJECT_BINARY_DIR}/driver") + add_subdirectory("${PROJECT_SOURCE_DIR}/../sysdig/driver" "${PROJECT_BINARY_DIR}/driver") include(FindMakedev) endif() -add_subdirectory("${SYSDIG_DIR}/userspace/libscap" "${PROJECT_BINARY_DIR}/userspace/libscap") -add_subdirectory("${SYSDIG_DIR}/userspace/libsinsp" "${PROJECT_BINARY_DIR}/userspace/libsinsp") +add_subdirectory("${PROJECT_SOURCE_DIR}/../sysdig/userspace/libscap" "${PROJECT_BINARY_DIR}/userspace/libscap") +add_subdirectory("${PROJECT_SOURCE_DIR}/../sysdig/userspace/libsinsp" "${PROJECT_BINARY_DIR}/userspace/libsinsp") set(FALCO_SINSP_LIBRARY sinsp) set(FALCO_SHARE_DIR share/falco) diff --git a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt index c76f99176dd..c6a1d719ede 100644 --- a/scripts/CMakeLists.txt +++ b/scripts/CMakeLists.txt @@ -25,7 +25,7 @@ file(COPY "${PROJECT_SOURCE_DIR}/scripts/rpm/falco" DESTINATION "${PROJECT_BINARY_DIR}/scripts/rpm") if(CMAKE_SYSTEM_NAME MATCHES "Linux") - install(PROGRAMS ${SYSDIG_DIR}/scripts/sysdig-probe-loader + install(PROGRAMS ${PROJECT_SOURCE_DIR}/../sysdig/scripts/sysdig-probe-loader DESTINATION ${FALCO_BIN_DIR} RENAME falco-probe-loader) endif() diff --git a/userspace/engine/CMakeLists.txt b/userspace/engine/CMakeLists.txt index 550399a4c98..2dbf3b50923 100644 --- a/userspace/engine/CMakeLists.txt +++ b/userspace/engine/CMakeLists.txt @@ -15,9 +15,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -include_directories("${SYSDIG_DIR}/userspace/libsinsp/third-party/jsoncpp") -include_directories("${SYSDIG_DIR}/userspace/libscap") -include_directories("${SYSDIG_DIR}/userspace/libsinsp") +include_directories("${PROJECT_SOURCE_DIR}/../sysdig/userspace/libsinsp/third-party/jsoncpp") +include_directories("${PROJECT_SOURCE_DIR}/../sysdig/userspace/libscap") +include_directories("${PROJECT_SOURCE_DIR}/../sysdig/userspace/libsinsp") include_directories("${PROJECT_BINARY_DIR}/userspace/engine") include_directories("${LUAJIT_INCLUDE}") include_directories("${NJSON_INCLUDE}") diff --git a/userspace/falco/CMakeLists.txt b/userspace/falco/CMakeLists.txt index c599ada9c63..81b79825db7 100644 --- a/userspace/falco/CMakeLists.txt +++ b/userspace/falco/CMakeLists.txt @@ -15,12 +15,12 @@ # See the License for the specific language governing permissions and # limitations under the License. # -include_directories("${SYSDIG_DIR}/userspace/libsinsp/third-party/jsoncpp") +include_directories("${PROJECT_SOURCE_DIR}/../sysdig/userspace/libsinsp/third-party/jsoncpp") include_directories("${LUAJIT_INCLUDE}") -include_directories("${SYSDIG_DIR}/userspace/libscap") -include_directories("${SYSDIG_DIR}/userspace/libsinsp") -include_directories("${SYSDIG_DIR}/userspace/sysdig") +include_directories("${PROJECT_SOURCE_DIR}/../sysdig/userspace/libscap") +include_directories("${PROJECT_SOURCE_DIR}/../sysdig/userspace/libsinsp") +include_directories("${PROJECT_SOURCE_DIR}/../sysdig/userspace/sysdig") include_directories("${PROJECT_SOURCE_DIR}/userspace/engine") include_directories("${PROJECT_BINARY_DIR}/userspace/falco") include_directories("${PROJECT_BINARY_DIR}/driver/src") @@ -31,7 +31,7 @@ include_directories("${YAMLCPP_INCLUDE_DIR}") include_directories("${CIVETWEB_INCLUDE_DIR}") include_directories("${DRAIOS_DEPENDENCIES_DIR}/yaml-${DRAIOS_YAML_VERSION}/target/include") -configure_file("${SYSDIG_DIR}/userspace/sysdig/config_sysdig.h.in" config_sysdig.h) +configure_file("${PROJECT_SOURCE_DIR}/../sysdig/userspace/sysdig/config_sysdig.h.in" config_sysdig.h) add_executable(falco configuration.cpp @@ -40,7 +40,7 @@ add_executable(falco event_drops.cpp statsfilewriter.cpp falco.cpp - "${SYSDIG_DIR}/userspace/sysdig/fields_info.cpp" + "${PROJECT_SOURCE_DIR}/../sysdig/userspace/sysdig/fields_info.cpp" webserver.cpp) target_link_libraries(falco falco_engine sinsp)