常规更新

register/register_library.cmake

@@ -4,9 +4,6 @@ include_guard(GLOBAL)
 include(${CMAKE_CURRENT_LIST_DIR}/base.cmake)
 
 
-
-
-
 set(tinyxml2_opts)
 _register_git_cmake_library(
         tinyxml2
@@ -17,9 +14,6 @@ _register_git_cmake_library(
 rcl_cmake_library_set_cmake_options(tinyxml2 ${tinyxml2_opts})
 
 
-
-
-
 set(jsoncpp_opts ${base_options})
 
 list(APPEND jsoncpp_opts
@@ -32,11 +26,11 @@ list(APPEND jsoncpp_opts
 rcl_get_effective_install_dir(jsoncpp _jsoncpp_install_dir)
 set(JSONCPP_ROOT ${_jsoncpp_install_dir})
 set(JSONCPP_INCLUDE_DIRS ${JSONCPP_ROOT}/include)
-if(MSVC)
-    set(JSONCPP_LIBRARIES ${JSONCPP_ROOT}/lib/jsoncpp_static.lib )
-else()
+if (MSVC)
+    set(JSONCPP_LIBRARIES ${JSONCPP_ROOT}/lib/jsoncpp_static.lib)
+else ()
     set(JSONCPP_LIBRARIES ${JSONCPP_ROOT}/lib/libjsoncpp.a)
-endif()
+endif ()
 _register_git_cmake_library(
         jsoncpp
         jsoncpp
@@ -61,7 +55,6 @@ rcl_cmake_library_set_clear_script(jsoncpp
 )
 
 
-
 # 闈瀋make浠撳簱
 #set(asio_opts ${base_options})
 #_register_git_cmake_library_opt(
@@ -72,9 +65,6 @@ rcl_cmake_library_set_clear_script(jsoncpp
 #)
 
 
-
-
-
 set(fmt_option ${base_options})
 _register_git_cmake_library(
         fmt
@@ -93,11 +83,6 @@ rcl_cmake_library_set_cmake_options(fmt ${fmt_option})
 #)
 
 
-
-
-
-
-
 # https://github.com/google/benchmark
 #BENCHMARK_USE_BUNDLED_GTEST
 set(benchmark_opt ${base_options})
@@ -152,7 +137,6 @@ rcl_cmake_library_set_other_use_opt(trantor
 )
 
 
-
 #find_path()
 set(drogon_opts ${base_options})
 list(APPEND drogon_opts "-DBUILD_CTL=OFF")
@@ -174,6 +158,17 @@ _register_git_cmake_library(
 rcl_cmake_library_set_cmake_options(drogon ${drogon_opts})
 rcl_cmake_library_set_deps(drogon libzip trantor jsoncpp zlib)
 
+rcl_cmake_library_set_init_script(
+        drogon
+        "if (NOT TARGET std::filesystem)"
+        "    add_library(std::filesystem INTERFACE IMPORTED GLOBAL)"
+        "    set_property(TARGET std::filesystem APPEND PROPERTY INTERFACE_COMPILE_FEATURES cxx_std_17)"
+        "endif ()"
+        "set(Filesystem_FOUND TRUE PARENT_SCOPE)"
+        "set(Filesystem_Final_FOUND TRUE PARENT_SCOPE)"
+        "message(drogon 加载filesystem!)"
+)
+
 
 set(ghc_filesystem_opts ${base_options})
 _register_git_cmake_library(
@@ -213,13 +208,9 @@ _register_git_cmake_library(
 rcl_cmake_library_set_cmake_options(libzmq ${libzmq_opts})
 
 
-
-
-
-
 set(protobuf_opts ${base_options})
-list(APPEND protobuf_opts  "-Dprotobuf_BUILD_TESTS=OFF")
-list(APPEND protobuf_opts  "-Dprotobuf_BUILD_SHARED_LIBS=OFF")
+list(APPEND protobuf_opts "-Dprotobuf_BUILD_TESTS=OFF")
+list(APPEND protobuf_opts "-Dprotobuf_BUILD_SHARED_LIBS=OFF")
 _register_git_cmake_library(
         protobuf
         protobuf
@@ -229,7 +220,6 @@ _register_git_cmake_library(
 rcl_cmake_library_set_cmake_options(protobuf ${protobuf_opts})
 
 
-
 set(gflags_opts ${base_options})
 _register_git_cmake_library(
         gflags
@@ -269,12 +259,6 @@ _register_git_cmake_library(
 rcl_cmake_library_set_cmake_options(cmocka ${cmocka_opts})
 
 
-
-
-
-
-
-
 # c++23 expected搴撶殑鍓嶈韩  娌℃湁c++23鏃朵娇鐢? 鍗曞ご鏂囦欢搴?set(expected_opts ${base_options})
 _register_git_cmake_library(
         expected
@@ -295,7 +279,6 @@ _register_git_cmake_library(
 rcl_cmake_library_set_cmake_options(sigslot ${sigslot_opts})
 
 
-
 #浠ｇ爜鐨刢make閲屽姞
 #add_compile_options("$<$<C_COMPILER_ID:MSVC>:/utf-8>")
 #add_compile_options("$<$<CXX_COMPILER_ID:MSVC>:/utf-8>")
@@ -320,7 +303,6 @@ _register_git_cmake_library(
 rcl_cmake_library_set_cmake_options(pybind11 ${SQLiteCpp_opts})
 
 
-
 #set(boost_locale_opts ${base_options})
 #_register_git_cmake_library_opt(
 #        "boost_locale"