wip

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

Hide file tree

Showing 3 changed files with 16 additions and 14 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -123,16 +123,13 @@ if(NOT WIN32)
 
 else()
 	set(MINIMAL_BUILD ON)
+	set(BUILD_SHARED_LIBS OFF)
 
+	set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>")
 	set(SYSDIG_FLAGS_WIN "-D_CRT_SECURE_NO_WARNINGS -DWIN32 -DMINIMAL_BUILD /EHsc /W3 /Zi")
 
-	if(CMAKE_VERSION VERSION_LESS 3.15.0)
-		set(SYSDIG_FLAGS_WIN_DEBUG "/MTd /Od")
-		set(SYSDIG_FLAGS_WIN_RELEASE "/MT")
-	else()
-		set(SYSDIG_FLAGS_WIN_DEBUG "/Od")
-		set(SYSDIG_FLAGS_WIN_RELEASE "")
-	endif()
+	set(SYSDIG_FLAGS_WIN_DEBUG "/Od")
+	set(SYSDIG_FLAGS_WIN_RELEASE "")
 
 	set(CMAKE_C_FLAGS "${SYSDIG_FLAGS_WIN}")
 	set(CMAKE_CXX_FLAGS "${SYSDIG_FLAGS_WIN}")

diff --git a/cmake/modules/falcosecurity-libs-repo/CMakeLists.txt b/cmake/modules/falcosecurity-libs-repo/CMakeLists.txt
@@ -23,13 +23,18 @@ project(falcosecurity-libs-repo NONE)
 include(ExternalProject)
 message(STATUS "Libs version: ${FALCOSECURITY_LIBS_VERSION}")
 
+if(BUILD_SHARED_LIBS)
+  set(LIBS_SUFFIX "${CMAKE_SHARED_LIBRARY_SUFFIX}")
+else()
+  set(LIBS_SUFFIX "${CMAKE_STATIC_LIBRARY_SUFFIX}")
+endif()
+
+set(LIB_LIB "/zlib${ZLIB_LIB_SUFFIX}")
 ExternalProject_Add(
   falcosecurity-libs
   URL "https://github.com/falcosecurity/libs/archive/${FALCOSECURITY_LIBS_VERSION}.tar.gz"
   URL_HASH "${FALCOSECURITY_LIBS_CHECKSUM}"
-  CONFIGURE_COMMAND ""
-  BUILD_COMMAND ""
-  INSTALL_COMMAND ""
-  TEST_COMMAND ""
-  PATCH_COMMAND ""
+  CMAKE_ARGS
+    -DCMAKE_MSVC_RUNTIME_LIBRARY=${CMAKE_MSVC_RUNTIME_LIBRARY}
+  BUILD_BYPRODUCTS ${CMAKE_BINARY_DIR}/libsinsp/${CMAKE_BUILD_TYPE}/sinsp${LIBS_SUFFIX}
 )
diff --git a/cmake/modules/luajit.cmake b/cmake/modules/luajit.cmake
@@ -99,8 +99,8 @@ 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_BYPRODUCTS ${LUAJIT_LIB}