Selaa lähdekoodia

fix & feat: 更新和修复一些问题

* 更新FFLags
* 更新CFEP
* 修复CFEP传入参数错误的问题
SongZihuan 3 vuotta sitten
vanhempi
sitoutus
8c573f5f69

+ 1 - 1
cmake/CMakeFindExternalProject/CMakeFindExternalProject.cmake

@@ -191,7 +191,7 @@ function(_cfep_build_inline name)
         message(STATUS "CMake Config ${name}...(Please Wait)")
     endif()
     execute_process(
-                    COMMAND "${CMAKE_COMMAND}" . -B ./build -G ${CMAKE_GENERATOR} ${_cmake_args}
+                    COMMAND "${CMAKE_COMMAND}" . -B ./build -G "${CMAKE_GENERATOR}" ${_cmake_args}
                     WORKING_DIRECTORY "${_cmake_dir}"
                     RESULT_VARIABLE re
                     OUTPUT_VARIABLE _stdout  # stdout的输出内容

+ 4 - 4
deps/deps.cmake

@@ -24,7 +24,7 @@ if (WIN32 AND NOT CYGWIN)  # cygwin 不依赖 dl
                   CMAKE_DIR ${dlfcn_cmake}
                   EXTERNAL
                   BUILD_CMAKE_CACHE_ARGS
-                      -DCMAKE_C_FLAGS:STRING=${CMAKE_C_FLAGS}
+                    "\"-DCMAKE_C_FLAGS:STRING=${CMAKE_C_FLAGS}\""
                   BUILD_DIR "dlfcn")
     set(dlfcn_lib dlfcn-win32::dl)
     get_target_property(dlfcn_include_dir dlfcn-win32::dl INTERFACE_INCLUDE_DIRECTORIES)
@@ -68,7 +68,7 @@ cfep_find_dir(PCRE2
               COMPONENTS 8BIT
               EXTERNAL
               BUILD_CMAKE_CACHE_ARGS
-                  -DCMAKE_C_FLAGS:STRING=${CMAKE_C_FLAGS}
+                "\"-DCMAKE_C_FLAGS:STRING=${CMAKE_C_FLAGS}\""
               BUILD_DIR "pcre2")
 unset(PCRE2_USE_STATIC_LIBS)
 set(pcre2_lib PCRE2::8BIT)
@@ -89,7 +89,7 @@ cfep_find_dir(FFlags
                   -DBUILD_SHARED_LIBS=OFF
                   -DFFLAGS_BUILD_TEST=OFF
               BUILD_CMAKE_CACHE_ARGS
-                  -DCMAKE_C_FLAGS:STRING=${CMAKE_C_FLAGS}
+                "\"-DCMAKE_C_FLAGS:STRING=${CMAKE_C_FLAGS}\""
               BUILD_DIR "fflags")
 set(fflags_lib FFlags::fflags)
 get_target_property(fflags_include_dir FFlags::fflags INTERFACE_INCLUDE_DIRECTORIES)
@@ -109,7 +109,7 @@ if (MSVC)
                   CMAKE_DIR "${CMAKE_CURRENT_LIST_DIR}/cmake"  # FindPThreadWin32.cmake 文件位置
                   EXTERNAL
                   BUILD_CMAKE_CACHE_ARGS
-                  -DCMAKE_C_FLAGS:STRING=${CMAKE_C_FLAGS}
+                    "\"-DCMAKE_C_FLAGS:STRING=${CMAKE_C_FLAGS}\""
                   BUILD_DIR "pthread")
     set(pthread_lib PThreadWin32::pthread)
     get_target_property(pthread_include_dir PThreadWin32::pthread INTERFACE_INCLUDE_DIRECTORIES)