fix(cmake): build luajit statically on win32 + bump

Signed-off-by: Roberto Scolaro <roberto.scolaro21@gmail.com>
draios · Jun 7, 2024 · 1e4fa19 · 1e4fa19
1 parent ea72d55
commit 1e4fa19
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 12 deletions.
diff --git a/cmake/modules/luajit.cmake b/cmake/modules/luajit.cmake
@@ -99,10 +99,10 @@ else()
 		else()
 			ExternalProject_Add(luajit
 				PREFIX "${PROJECT_BINARY_DIR}/luajit-prefix"
-				URL "https://github.com/LuaJIT/LuaJIT/archive/v2.1.0-beta3.tar.gz"
-				URL_HASH "SHA256=409f7fe570d3c16558e594421c47bdd130238323c9d6fd6c83dedd2aaeb082a8"
+					GIT_REPOSITORY "https://github.com/LuaJIT/LuaJIT"
+					GIT_TAG "f3c856915b4ce7ccd24341e8ac73e8a9fd934171"
 				CONFIGURE_COMMAND ""
-				BUILD_COMMAND msvcbuild.bat
+				BUILD_COMMAND msvcbuild.bat static
 				BUILD_BYPRODUCTS ${LUAJIT_LIB}
 				BINARY_DIR "${LUAJIT_SRC}"
 				INSTALL_COMMAND "")

diff --git a/userspace/sysdig/CMakeLists.txt b/userspace/sysdig/CMakeLists.txt
@@ -153,11 +153,6 @@ else()
 
 	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_directory
 			"${PROJECT_SOURCE_DIR}/userspace/sysdig/chisels"
@@ -185,10 +180,6 @@ else()
 			DESTINATION programs
 			COMPONENT "${SYSDIG_COMPONENT_NAME}")
 
-		#install(FILES "${LUAJIT_SRC}/lua51.dll"
-		#		DESTINATION programs
-		#		COMPONENT "${SYSDIG_COMPONENT_NAME}")
-
 endif()
 
 configure_file(config_sysdig.h.in config_sysdig.h)