update: sysdig dir gate in subdirectories

Signed-off-by: Lorenzo Fontana <lo@linux.com> Co-authored-by: Leonardo Di Donato <leodidonato@gmail.com>
falcosecurity · Jul 3, 2019 · 19c1204 · 19c1204
1 parent e688ab7
commit 19c1204
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 3 deletions.
diff --git a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt
@@ -18,6 +18,10 @@
 configure_file(debian/postinst.in debian/postinst)
 configure_file(debian/prerm.in debian/prerm)
 
+if(NOT SYSDIG_DIR)
+	set(SYSDIG_DIR "${PROJECT_SOURCE_DIR}/../sysdig")
+endif()
+
 file(COPY "${PROJECT_SOURCE_DIR}/scripts/debian/falco"
 	DESTINATION "${PROJECT_BINARY_DIR}/scripts/debian")
 

diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
@@ -40,6 +40,7 @@ if(FALCO_BUILD_TESTS)
            "${FAKEIT_INCLUDE}"
            "${PROJECT_SOURCE_DIR}/userspace/engine")
 
+  include(CMakeParseArguments)
   include(CTest)
   include(Catch)
   catch_discover_tests(falco_test)

diff --git a/userspace/engine/CMakeLists.txt b/userspace/engine/CMakeLists.txt
@@ -15,6 +15,10 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+if(NOT SYSDIG_DIR)
+	set(SYSDIG_DIR "${PROJECT_SOURCE_DIR}/../sysdig")
+endif()
+
 set(FALCO_ENGINE_SOURCE_FILES
 	rules.cpp
 	falco_common.cpp

diff --git a/userspace/falco/CMakeLists.txt b/userspace/falco/CMakeLists.txt
@@ -15,8 +15,11 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+if(NOT SYSDIG_DIR)
+	set(SYSDIG_DIR "${PROJECT_SOURCE_DIR}/../sysdig")
+endif()
 
-configure_file("${PROJECT_SOURCE_DIR}/../sysdig/userspace/sysdig/config_sysdig.h.in" config_sysdig.h)
+configure_file("${SYSDIG_DIR}/userspace/sysdig/config_sysdig.h.in" config_sysdig.h)
 
 add_executable(falco
 	configuration.cpp
@@ -25,7 +28,7 @@ add_executable(falco
 	event_drops.cpp
 	statsfilewriter.cpp
 	falco.cpp
-	"${PROJECT_SOURCE_DIR}/../sysdig/userspace/sysdig/fields_info.cpp"
+	"${SYSDIG_DIR}/userspace/sysdig/fields_info.cpp"
 	webserver.cpp)
 
 target_include_directories(falco PUBLIC
@@ -39,7 +42,7 @@ target_include_directories(falco PUBLIC
 
 target_link_libraries(falco falco_engine sinsp)
 target_link_libraries(falco
-        "${LIBYAML_LIB}"
+	"${LIBYAML_LIB}"
 	"${YAMLCPP_LIB}"
 	"${CIVETWEB_LIB}")