wip

Signed-off-by: Roberto Scolaro <[email protected]>

userspace/sysdig/CMakeLists.txt

@@ -83,7 +83,7 @@ if(USE_BUNDLED_DEPS)
 	add_dependencies(csysdig njson)
 	add_dependencies(sysdig yaml-cpp)
 	add_dependencies(csysdig yaml-cpp)
-	if(NOT WIN32)
+	if(WITH_CHISEL)
 		add_dependencies(sysdig luajit)
 		add_dependencies(csysdig luajit)
 	endif()
@@ -94,6 +94,7 @@ target_include_directories(
 	PUBLIC
 		"${YAMLCPP_INCLUDE_DIR}"
 		"${NJSON_INCLUDE_DIR}"
+		"${LUAJIT_INCLUDE}"
 		../chisel
 		..
 	)
@@ -103,6 +104,7 @@ target_include_directories(
 	PUBLIC
 		"${YAMLCPP_INCLUDE_DIR}"
 		"${NJSON_INCLUDE_DIR}"
+		"${LUAJIT_INCLUDE}"
 		../chisel
 		..
 	)
@@ -144,20 +146,22 @@ else()
 
 	target_link_libraries(sysdig
 		sinsp
+		"${LUAJIT_LIB}"
 		"${YAMLCPP_LIB}")
 
 	target_link_libraries(csysdig
 		sinsp
+		"${LUAJIT_LIB}"
 		"${YAMLCPP_LIB}")
 
 	target_link_libraries(sysdig odbc32.lib odbccp32.lib Netapi32.lib Iphlpapi.lib)
 
 	target_link_libraries(csysdig odbc32.lib odbccp32.lib Netapi32.lib Iphlpapi.lib)
 
-	add_custom_command(TARGET sysdig POST_BUILD
-		COMMAND "${CMAKE_COMMAND}" -E copy_if_different
-			"${LUAJIT_SRC}/lua51.dll"
-			"${PROJECT_BINARY_DIR}/$(Configuration)/lua51.dll")
+	#add_custom_command(TARGET sysdig POST_BUILD
+	#	COMMAND "${CMAKE_COMMAND}" -E copy_if_different
+	#		"${LUAJIT_SRC}/lua51.dll"
+	#		"${PROJECT_BINARY_DIR}/$(Configuration)/lua51.dll")
 
 	add_custom_command(TARGET sysdig POST_BUILD
 		COMMAND "${CMAKE_COMMAND}" -E copy_directory
@@ -186,9 +190,9 @@ else()
 			DESTINATION programs
 			COMPONENT "${SYSDIG_COMPONENT_NAME}")
 
-	install(FILES "${LUAJIT_SRC}/lua51.dll"
-			DESTINATION programs
-			COMPONENT "${SYSDIG_COMPONENT_NAME}")
+		#install(FILES "${LUAJIT_SRC}/lua51.dll"
+		#		DESTINATION programs
+		#		COMPONENT "${SYSDIG_COMPONENT_NAME}")
 
 endif()