fix: windows

Author: vansangpfiev

.gitattributes

@@ -44,22 +44,22 @@ if(NOT CORTEX_CQA)
         add_link_options($<$<CONFIG:Release>:-flto>)
     elseif(MSVC)
         # Add optimization flags for MSVC
-        # add_compile_options($<$<CONFIG:Release>:/O2>)
+        add_compile_options($<$<CONFIG:Release>:/O2>)
         # Optional: Link-time optimization
-        # add_compile_options($<$<CONFIG:Release>:/GL>)
-        # add_link_options($<$<CONFIG:Release>:/LTCG>)
+        add_compile_options($<$<CONFIG:Release>:/GL>)
+        add_link_options($<$<CONFIG:Release>:/LTCG>)
     endif()
 endif()
 
 if(MSVC)
 # set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON)
-  # add_compile_options(
+  add_compile_options(
   #     $<$<CONFIG:>:/MT> #---------|
   #     $<$<CONFIG:Debug>:/MTd> #---|-- Statically link the runtime libraries
   #     $<$<CONFIG:Release>:/MT> #--|
-  #     $<$<CONFIG:Release>:/O2> #--|-- Optimize for speed in Release mode
-  #     $<$<CONFIG:Release>:/Ob2> #-|-- Inline any suitable function
-  # )
+      $<$<CONFIG:Release>:/O2> #--|-- Optimize for speed in Release mode
+      $<$<CONFIG:Release>:/Ob2> #-|-- Inline any suitable function
+  )
 
   add_compile_options(/utf-8)
   add_definitions(-DUNICODE -D_UNICODE)
@@ -95,11 +95,11 @@ 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)
-# if(CMAKE_BUILD_TEST)
-  # add_subdirectory(test)
-# endif()
+if(CMAKE_BUILD_TEST)
+  add_subdirectory(test)
+endif()
 
-# add_subdirectory(cli)
+add_subdirectory(cli)
 
 if(CMAKE_BUILD_INJA_TEST)
   add_subdirectory(examples/inja)

engine/CMakeLists.txt

@@ -21,11 +21,11 @@ set(OPENSSL_USE_STATIC_LIBS TRUE)
 set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
 
 if(MSVC)
-  add_compile_options(
-      $<$<CONFIG:>:/MT> #---------|
-      $<$<CONFIG:Debug>:/MTd> #---|-- Statically link the runtime libraries
-      $<$<CONFIG:Release>:/MT> #--|
-  )
+  # add_compile_options(
+  #     $<$<CONFIG:>:/MT> #---------|
+  #     $<$<CONFIG:Debug>:/MTd> #---|-- Statically link the runtime libraries
+  #     $<$<CONFIG:Release>:/MT> #--|
+  # )
 
   add_compile_options(/utf-8)
   add_definitions(-DUNICODE -D_UNICODE)

engine/cli/CMakeLists.txt

@@ -1,42 +1,10 @@
 include(FetchContent)
 
-# FetchContent_Declare(c-ares
-#     GIT_REPOSITORY https://github.com/c-ares/c-ares.git
-#     GIT_TAG v1.34.4
-# )
-
-# FetchContent_MakeAvailable(c-ares)
-# set(C-ARES_INCLUDE_DIRS "${c-ares_BINARY_DIR}" "${c-ares_SOURCE_DIR}/include")
-
-# set(C-ARES_LIBRARIES ${CMAKE_CURRENT_BINARY_DIR}/lib)
-# message("xxx="${C-ARES_LIBRARIES})
-
-# FetchContent_Declare(jsoncpp
-#     GIT_REPOSITORY https://github.com/open-source-parsers/jsoncpp.git
-#     GIT_TAG 1.9.5
-# )
-
-# FetchContent_MakeAvailable(jsoncpp)
-# MESSAGE("jsoncpp_SOURCE_DIR" ${jsoncpp_SOURCE_DIR})
-
-# set(JSONCPP_INCLUDE_DIRS "${jsoncpp_SOURCE_DIR}/include")
-# set(JSONCPP_LIBRARIES "${jsoncpp_BINARY_DIR}")
 set(USE_OSSP_UUID TRUE)
 
-
-# FetchContent_Declare(openssl
-#     GIT_REPOSITORY https://github.com/openssl/openssl.git
-#     GIT_TAG openssl-3.4.1
-# )
-
-# FetchContent_MakeAvailable(openssl)
-
-# set(OPENSSL_SSL_LIBRARY SSL)
-# set(OPENSSL_CRYPTO_LIBRARY Crypto)
 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}/lib)
-# set(OPENSSL_INCLUDE_DIR "${openssl_BINARY_DIR}/include" "${openssl_BINARY_DIR}")
 
 set(ZLIB_INSTALL_DIR ${CMAKE_CURRENT_BINARY_DIR}/../build_deps/zlib/install)
 set(ZLIB_INCLUDE_DIR ${ZLIB_INSTALL_DIR}/include)
@@ -46,29 +14,16 @@ set(ZLIB_LIBRARY ${ZLIB_INSTALL_DIR}/lib/zlib.lib)
 set(JSONCPP_INSTALL_DIR ${CMAKE_CURRENT_BINARY_DIR}/../build_deps/jsoncpp-lib)
 set(JSONCPP_LIBRARIES ${JSONCPP_INSTALL_DIR}/lib/jsoncpp.lib)
 set(JSONCPP_INCLUDE_DIRS ${JSONCPP_INSTALL_DIR}/include)
-message("JSONCPP_INCLUDE_DIRS="${JSONCPP_INCLUDE_DIRS})
 
 set(C-ARES_INSTALL_DIR ${CMAKE_CURRENT_BINARY_DIR}/../build_deps/c-ares-lib)
 set(C-ARES_LIBRARIES ${C-ARES_INSTALL_DIR}/lib/cares.lib)
 set(C-ARES_INCLUDE_DIRS ${C-ARES_INSTALL_DIR}/include)
-# message("C-ARES_INCLUDE_DIRS="${C-ARES_INCLUDE_DIRS})
-# FetchContent_GetProperties(openssl)
-# if(NOT openssl_POPULATED)
-#     FetchContent_Populate(openssl)
-#     add_subdirectory(${openssl_SOURCE_DIR} ${openssl_BINARY_DIR})
-# endif()
-MESSAGE("sang1" ${OPENSSL_ROOT_DIR})
+
 find_package(OpenSSL REQUIRED)
 find_package(ZLIB REQUIRED)
-MESSAGE("sang1" ${OPENSSL_ROOT_DIR})
 FetchContent_Declare(drogon
     GIT_REPOSITORY https://github.com/drogonframework/drogon.git
     GIT_TAG v1.9.10
 )
-MESSAGE("sang2")
-FetchContent_MakeAvailable(drogon)
-MESSAGE("sang3")
 
-# add_library(drogon-1 INTERFACE)
-# target_include_directories(drogon-1 INTERFACE ${drogon_SOURCE_DIR}/include ${drogon_BINARY_DIR}/include)
-# target_link_libraries(drogon INTERFACE event event_pthreads)
+FetchContent_MakeAvailableWithArgs(drogon BUILD_CTL=OFF)

engine/cmake/drogon.cmake

@@ -4,5 +4,5 @@ FetchContent_Declare(googletest
     GIT_REPOSITORY https://github.com/google/googletest.git
     GIT_TAG v1.16.0
 )
-
+set(gtest_force_shared_crt ON CACHE BOOL "" FORCE)
 FetchContent_MakeAvailable(googletest)

engine/cmake/gtest.cmake

@@ -30,7 +30,7 @@ TEST_F(FunctionCallingUtilsTest, HasTools) {
   (*request)["tools"] = "random";
   EXPECT_FALSE(function_calling_utils::HasTools(request));
 
-  (*request)["tools"] = Json::Value::null;
+  (*request)["tools"] = Json::Value(Json::nullValue);
   EXPECT_FALSE(function_calling_utils::HasTools(request));
 }