chore: windows

Author: sangjanai

engine/CMakeLists.txt

@@ -92,15 +92,18 @@ add_compile_definitions(CORTEX_CONFIG_FILE_PATH="${CORTEX_CONFIG_FILE_PATH}")
 
 option(CMAKE_BUILD_TEST "Enable testing" ON)
 option(CMAKE_BUILD_INJA_TEST "Enable inja example" OFF)
+set(OPENSSL_INSTALL_DIR ${CMAKE_CURRENT_BINARY_DIR}/../build_deps/openssl)
+set(OPENSSL_INCLUDE_DIR ${OPENSSL_INSTALL_DIR}/include)
+set(OPENSSL_ROOT_DIR ${OPENSSL_INSTALL_DIR}/lib64)
+find_package(OpenSSL REQUIRED)
+
 if(CMAKE_BUILD_TEST)
   add_subdirectory(test)
 endif()
 
 add_subdirectory(cli)
 
-set(OPENSSL_INSTALL_DIR ${CMAKE_CURRENT_BINARY_DIR}/../build_deps/openssl)
-set(OPENSSL_INCLUDE_DIR ${OPENSSL_INSTALL_DIR}/include)
-set(OPENSSL_ROOT_DIR ${OPENSSL_INSTALL_DIR}/lib64)
+
 
 if(CMAKE_BUILD_INJA_TEST)
   add_subdirectory(examples/inja)
@@ -213,6 +216,7 @@ if(APPLE)
   target_link_libraries(${TARGET_NAME} PRIVATE ${COREFOUNDATION_LIB} ${FOUNDATION_LIB} ${CORESERVICES_LIB})
 endif()
 
+target_link_libraries(${TARGET_NAME} PRIVATE OpenSSL::SSL OpenSSL::Crypto)
 target_link_libraries(${TARGET_NAME} PRIVATE minizip)
 target_link_libraries(${TARGET_NAME} PRIVATE archive)
 target_link_libraries(${TARGET_NAME} PRIVATE trantor)

engine/Makefile

@@ -33,7 +33,7 @@ all:
 # Build the Cortex engine
 build:
 ifeq ($(OS),Windows_NT)
-	@powershell -Command "mkdir -p build; cd build; cmake .. $(CMAKE_EXTRA_FLAGS); cmake --build . --config Release -j4;"
+	@powershell -Command "cmake -S ./third-party -B ./build_deps; cmake --build ./build_deps --config Release -j4; mkdir -p build; cd build; cmake .. $(CMAKE_EXTRA_FLAGS); cmake --build . --config Release -j4;"
 else ifeq ($(shell uname -s),Linux)
 	@cmake -S ./third-party -B ./build_deps; \
 	make -C build_deps/ -j4; \

engine/cli/CMakeLists.txt

@@ -46,6 +46,11 @@ add_compile_definitions(CORTEX_VARIANT="${CORTEX_VARIANT}")
 add_compile_definitions(CORTEX_CPP_VERSION="${CORTEX_CPP_VERSION}")
 add_compile_definitions(CORTEX_CONFIG_FILE_PATH="${CORTEX_CONFIG_FILE_PATH}")
 
+set(OPENSSL_INSTALL_DIR ${CMAKE_CURRENT_BINARY_DIR}/../build_deps/openssl)
+set(OPENSSL_INCLUDE_DIR ${OPENSSL_INSTALL_DIR}/include)
+set(OPENSSL_ROOT_DIR ${OPENSSL_INSTALL_DIR}/lib64)
+find_package(OpenSSL REQUIRED)
+
 # find_package(jsoncpp CONFIG REQUIRED)
 # find_package(yaml-cpp CONFIG REQUIRED)
 # find_package(CLI11 CONFIG REQUIRED)
@@ -85,7 +90,7 @@ add_executable(${TARGET_NAME} main.cc
     ${CMAKE_CURRENT_SOURCE_DIR}/../utils/process/utils.cc
   )
 
-
+target_link_libraries(${TARGET_NAME} PRIVATE OpenSSL::SSL OpenSSL::Crypto)
 target_link_libraries(${TARGET_NAME} PRIVATE CLI11)
 target_link_libraries(${TARGET_NAME} PRIVATE SQLiteCpp)
 target_link_libraries(${TARGET_NAME} PRIVATE minizip)

engine/cmake/curl.cmake

@@ -4,14 +4,16 @@ set(OPENSSL_INSTALL_DIR ${CMAKE_CURRENT_BINARY_DIR}/../build_deps/openssl)
 set(OPENSSL_INCLUDE_DIR ${OPENSSL_INSTALL_DIR}/include)
 set(OPENSSL_ROOT_DIR ${OPENSSL_INSTALL_DIR}/lib64)
 
+find_package(OpenSSL REQUIRED)
+
 FetchContent_Declare(curl
     GIT_REPOSITORY https://github.com/curl/curl.git
-    GIT_TAG curl-8_12_1
+    GIT_TAG curl-8_13_0
 )
 
+
 FetchContent_MakeAvailableWithArgs(curl
     CURL_USE_LIBPSL=OFF
     BUILD_EXAMPLES=OFF
-    OPENSSL_ROOT_DIR=${CMAKE_CURRENT_BINARY_DIR}/../build_deps/openssl/lib64
-    OPENSSL_INCLUDE_DIR=${CMAKE_CURRENT_BINARY_DIR}/../build_deps/openssl/include
 )
+

engine/cmake/drogon.cmake

@@ -39,13 +39,13 @@ else()
 endif()
 set(C-ARES_INCLUDE_DIRS ${C-ARES_INSTALL_DIR}/include)
 
+find_package(OpenSSL REQUIRED)
+
 FetchContent_Declare(drogon
     GIT_REPOSITORY https://github.com/drogonframework/drogon.git
     GIT_TAG v1.9.10
 )
 
 FetchContent_MakeAvailableWithArgs(drogon
     BUILD_CTL=OFF
-    OPENSSL_ROOT_DIR=${CMAKE_CURRENT_BINARY_DIR}/../build_deps/openssl/lib64
-    OPENSSL_INCLUDE_DIR=${CMAKE_CURRENT_BINARY_DIR}/../build_deps/openssl/include
 )

engine/cmake/minizip.cmake

@@ -1,15 +1,14 @@
 include(FetchContent)
 
 include(cmake/utils.cmake)
-# set(ENABLE_TEST OFF)
-# set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON)
-MESSAGE("Start minizip")
+
 FetchContent_Declare(minizip
     GIT_REPOSITORY https://github.com/zlib-ng/minizip-ng.git
     GIT_TAG 4.0.8
 )
 
-# FetchContent_MakeAvailable(minizip)
-MESSAGE("End minizip")
-
-FetchContent_MakeAvailableWithArgs(minizip MZ_BUILD_TESTS=OFF BUILD_SHARED_LIBS=OFF)
+if(MSVC)
+    FetchContent_MakeAvailableWithArgs(minizip MZ_BUILD_TESTS=OFF BUILD_SHARED_LIBS=OFF)
+else()
+    FetchContent_MakeAvailable(minizip)
+endif()

engine/test/components/CMakeLists.txt

@@ -2,6 +2,11 @@ file(GLOB SRCS *.cc)
 project(test-components)
 
 enable_testing()
+
+set(OPENSSL_INSTALL_DIR ${CMAKE_CURRENT_BINARY_DIR}/../build_deps/openssl)
+set(OPENSSL_INCLUDE_DIR ${OPENSSL_INSTALL_DIR}/include)
+set(OPENSSL_ROOT_DIR ${OPENSSL_INSTALL_DIR}/lib64)
+find_package(OpenSSL REQUIRED)
 
 add_executable(${PROJECT_NAME} 
   ${SRCS}