fix(userspace): correct include directories

Co-Authored-By: Lorenzo Fontana <[email protected]>
Signed-off-by: Leonardo Di Donato <[email protected]>

userspace/engine/CMakeLists.txt

@@ -14,15 +14,6 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # 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_BINARY_DIR}/userspace/engine")
-include_directories("${LUAJIT_INCLUDE}")
-include_directories("${NJSON_INCLUDE}")
-include_directories("${CURL_INCLUDE_DIR}")
-include_directories("${TBB_INCLUDE_DIR}")
 
 set(FALCO_ENGINE_SOURCE_FILES
 	rules.cpp
@@ -38,7 +29,13 @@ add_library(falco_engine STATIC ${FALCO_ENGINE_SOURCE_FILES})
 target_include_directories(falco_engine PUBLIC
 	"${LUAJIT_INCLUDE}"
 	"${NJSON_INCLUDE}"
-	"${PROJECT_BINARY_DIR}/userspace/engine")
+	"${CURL_INCLUDE_DIR}"
+	"${TBB_INCLUDE_DIR}"
+	"${SYSDIG_DIR}/userspace/libsinsp/third-party/jsoncpp"
+	"${SYSDIG_DIR}/userspace/libscap"
+	"${SYSDIG_DIR}/userspace/libsinsp"
+	"${PROJECT_BINARY_DIR}/userspace/engine"
+	)
 
 target_link_libraries(falco_engine
   "${FALCO_SINSP_LIBRARY}"

userspace/falco/CMakeLists.txt

@@ -15,21 +15,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-include_directories("${PROJECT_SOURCE_DIR}/../sysdig/userspace/libsinsp/third-party/jsoncpp")
-include_directories("${LUAJIT_INCLUDE}")
-
-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")
-include_directories("${CURL_INCLUDE_DIR}")
-include_directories("${TBB_INCLUDE_DIR}")
-include_directories("${NJSON_INCLUDE}")
-include_directories("${YAMLCPP_INCLUDE_DIR}")
-include_directories("${CIVETWEB_INCLUDE_DIR}")
-include_directories("${DRAIOS_DEPENDENCIES_DIR}/yaml-${DRAIOS_YAML_VERSION}/target/include")
 
 configure_file("${PROJECT_SOURCE_DIR}/../sysdig/userspace/sysdig/config_sysdig.h.in" config_sysdig.h)
 
@@ -43,6 +28,15 @@ add_executable(falco
 	"${PROJECT_SOURCE_DIR}/../sysdig/userspace/sysdig/fields_info.cpp"
 	webserver.cpp)
 
+target_include_directories(falco PUBLIC
+	"${SYSDIG_DIR}/userspace/sysdig"
+	"${PROJECT_SOURCE_DIR}/userspace/engine"
+	"${PROJECT_BINARY_DIR}/userspace/falco"
+	"${PROJECT_BINARY_DIR}/driver/src"
+	"${YAMLCPP_INCLUDE_DIR}"
+	"${CIVETWEB_INCLUDE_DIR}"
+	"${DRAIOS_DEPENDENCIES_DIR}/yaml-${DRAIOS_YAML_VERSION}/target/include")
+
 target_link_libraries(falco falco_engine sinsp)
 target_link_libraries(falco
         "${LIBYAML_LIB}"