浏览代码

fix: 修复CMake中add_custom_xxx的转义错误

SongZihuan 3 年之前
父节点
当前提交
5cd9dc4c27
共有 3 个文件被更改,包括 11 次插入6 次删除
  1. 2 1
      cmake/deps_install.cmake
  2. 6 3
      deps/CMakeLists.txt
  3. 3 2
      lang/hgt.cmake

+ 2 - 1
cmake/deps_install.cmake

@@ -31,7 +31,8 @@ macro(set_copy_command target a b)
     add_custom_command(TARGET ${target} POST_BUILD
             COMMAND "${CMAKE_COMMAND}" "-E" "copy_if_different" "${a}" "${b}"
             COMMENT "Copy ${a} to ${b}."
-            WORKING_DIRECTORY ${CMAKE_BINARY_DIR})
+            WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
+	    VERBATIM)
 endmacro()
 
 function(_wi_build_import_inline target run)

+ 6 - 3
deps/CMakeLists.txt

@@ -20,7 +20,8 @@ if (WIN32 AND NOT CYGWIN)  # cygwin 不依赖 dl
             COMMAND ${CMAKE_COMMAND} --build .
             COMMAND ${CMAKE_COMMAND} --install .
             WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/dlfcn-win32
-            COMMENT "Build dlfcn-win32")
+            COMMENT "Build dlfcn-win32"
+	    VERBATIM)
 endif()
 
 execute_process(
@@ -36,8 +37,10 @@ add_custom_command(TARGET PCRE2-build POST_BUILD
         "-DPCRE2_STATIC_PIC=ON"
         "-DPCRE2_BUILD_TESTS=OFF"
         "-DPCRE2_BUILD_PCRE2GREP=OFF"
-        "-G ${CMAKE_GENERATOR}"
+        "-G" "${CMAKE_GENERATOR}"
         COMMAND ${CMAKE_COMMAND} --build .
         COMMAND ${CMAKE_COMMAND} --install .
         WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/pcre2
-        COMMENT "Build PCRE2")
+	COMMENT "Build PCRE2"
+	VERBATIM)
+

+ 3 - 2
lang/hgt.cmake

@@ -27,7 +27,8 @@ unset(include_n)
 add_custom_target(hgt ALL)
 add_custom_command(TARGET hgt POST_BUILD
                    COMMAND ${HGT_COMMAND}
-                   COMMENT "The hgt generate file: base")
+                   COMMENT "The hgt generate file: base"
+		   VERBATIM)
 
 execute_process(COMMAND ${HGT_COMMAND}
                 RESULT_VARIABLE re
@@ -93,4 +94,4 @@ function(build_lang)
 endfunction()
 
 build_lang()  # 使用函数防止 CMAKE_RUNTIME_OUTPUT_DIRECTORY 影响外部
-unset(hgt-name)
+unset(hgt-name)