fix ninja error (#52796)

* fix ninja error * fix_ninja_error_qa

fix ninja error (#52796)
* fix ninja error * fix_ninja_error_qa
c5e1987c · risemeup1 · GitHub · 94cc1d6b · c5e1987c
隐藏空白更改
内联并排

Showing with 66 addition and 31 deletion

cmake/external/gtest.cmake cmake/external/gtest.cmake +66 -31

未找到文件。
--- a/cmake/external/gtest.cmake
+++ b/cmake/external/gtest.cmake
@@ -69,37 +69,72 @@ if(NOT WIN32 AND ${CMAKE_CXX_COMPILER_VERSION} VERSION_GREATER 12.0)
  set(GTEST_PATCH_COMMAND patch -d ${GTEST_SOURCE_DIR}/googletest/src <
                          ${native_src})
 endif()
-ExternalProject_Add(
+if(WIN32)
-  extern_gtest
+  ExternalProject_Add(
-  ${EXTERNAL_PROJECT_LOG_ARGS} ${SHALLOW_CLONE}
+    extern_gtest
-  GIT_REPOSITORY ${GTEST_REPOSITORY}
+    ${EXTERNAL_PROJECT_LOG_ARGS} ${SHALLOW_CLONE}
-  GIT_TAG ${GTEST_TAG}
+    GIT_REPOSITORY ${GTEST_REPOSITORY}
-  DEPENDS ${GTEST_DEPENDS}
+    GIT_TAG ${GTEST_TAG}
-  PREFIX ${GTEST_PREFIX_DIR}
+    DEPENDS ${GTEST_DEPENDS}
-  UPDATE_COMMAND ""
+    PREFIX ${GTEST_PREFIX_DIR}
-  PATCH_COMMAND ${GTEST_PATCH_COMMAND}
+    UPDATE_COMMAND ""
-  CMAKE_ARGS -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}
+    PATCH_COMMAND ${GTEST_PATCH_COMMAND}
-             -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}
+    CMAKE_ARGS -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}
-             -DCMAKE_CXX_FLAGS=${GTEST_CMAKE_CXX_FLAGS}
+               -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}
-             -DCMAKE_CXX_FLAGS_RELEASE=${CMAKE_CXX_FLAGS_RELEASE}
+               -DCMAKE_CXX_FLAGS=${GTEST_CMAKE_CXX_FLAGS}
-             -DCMAKE_CXX_FLAGS_DEBUG=${CMAKE_CXX_FLAGS_DEBUG}
+               -DCMAKE_CXX_FLAGS_RELEASE=${CMAKE_CXX_FLAGS_RELEASE}
-             -DCMAKE_C_FLAGS=${GTEST_CMAKE_C_FLAGS}
+               -DCMAKE_CXX_FLAGS_DEBUG=${CMAKE_CXX_FLAGS_DEBUG}
-             -DCMAKE_C_FLAGS_DEBUG=${CMAKE_C_FLAGS_DEBUG}
+               -DCMAKE_C_FLAGS=${GTEST_CMAKE_C_FLAGS}
-             -DCMAKE_C_FLAGS_RELEASE=${CMAKE_C_FLAGS_RELEASE}
+               -DCMAKE_C_FLAGS_DEBUG=${CMAKE_C_FLAGS_DEBUG}
-             -DCMAKE_INSTALL_PREFIX=${GTEST_INSTALL_DIR}
+               -DCMAKE_C_FLAGS_RELEASE=${CMAKE_C_FLAGS_RELEASE}
-             -DCMAKE_POSITION_INDEPENDENT_CODE=ON
+               -DCMAKE_INSTALL_PREFIX=${GTEST_INSTALL_DIR}
-             -DBUILD_GMOCK=ON
+               -DCMAKE_POSITION_INDEPENDENT_CODE=ON
-             -Dgtest_disable_pthreads=ON
+               -DBUILD_GMOCK=ON
-             -Dgtest_force_shared_crt=ON
+               -Dgtest_disable_pthreads=ON
-             -DCMAKE_BUILD_TYPE=${THIRD_PARTY_BUILD_TYPE}
+               -Dgtest_force_shared_crt=ON
-             ${EXTERNAL_OPTIONAL_ARGS}
+               -DCMAKE_BUILD_TYPE=${THIRD_PARTY_BUILD_TYPE}
-  CMAKE_CACHE_ARGS
+               ${EXTERNAL_OPTIONAL_ARGS}
-    -DCMAKE_INSTALL_PREFIX:PATH=${GTEST_INSTALL_DIR}
+    CMAKE_CACHE_ARGS
-    -DCMAKE_POSITION_INDEPENDENT_CODE:BOOL=ON
+      -DCMAKE_INSTALL_PREFIX:PATH=${GTEST_INSTALL_DIR}
-    -DCMAKE_BUILD_TYPE:STRING=${THIRD_PARTY_BUILD_TYPE}
+      -DCMAKE_POSITION_INDEPENDENT_CODE:BOOL=ON
-  BUILD_BYPRODUCTS ${GTEST_LIBRARIES}
+      -DCMAKE_BUILD_TYPE:STRING=${THIRD_PARTY_BUILD_TYPE}
-  BUILD_BYPRODUCTS ${GTEST_MAIN_LIBRARIES}
+    BUILD_BYPRODUCTS ${GTEST_LIBRARIES}
-  BUILD_BYPRODUCTS ${GMOCK_LIBRARIES})
+    BUILD_BYPRODUCTS ${GTEST_MAIN_LIBRARIES}
+    BUILD_BYPRODUCTS ${GMOCK_LIBRARIES})
+else()
+  ExternalProject_Add(
+    extern_gtest
+    ${EXTERNAL_PROJECT_LOG_ARGS} ${SHALLOW_CLONE}
+    GIT_REPOSITORY ${GTEST_REPOSITORY}
+    GIT_TAG ${GTEST_TAG}
+    DEPENDS ${GTEST_DEPENDS}
+    PREFIX ${GTEST_PREFIX_DIR}
+    UPDATE_COMMAND ""
+    PATCH_COMMAND ${GTEST_PATCH_COMMAND}
+    CMAKE_ARGS -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}
+               -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}
+               -DCMAKE_CXX_FLAGS=${GTEST_CMAKE_CXX_FLAGS}
+               -DCMAKE_CXX_FLAGS_RELEASE=${CMAKE_CXX_FLAGS_RELEASE}
+               -DCMAKE_CXX_FLAGS_DEBUG=${CMAKE_CXX_FLAGS_DEBUG}
+               -DCMAKE_C_FLAGS=${GTEST_CMAKE_C_FLAGS}
+               -DCMAKE_C_FLAGS_DEBUG=${CMAKE_C_FLAGS_DEBUG}
+               -DCMAKE_C_FLAGS_RELEASE=${CMAKE_C_FLAGS_RELEASE}
+               -DCMAKE_INSTALL_PREFIX=${GTEST_INSTALL_DIR}
+               -DCMAKE_POSITION_INDEPENDENT_CODE=ON
+               -DBUILD_GMOCK=ON
+               -Dgtest_disable_pthreads=ON
+               -Dgtest_force_shared_crt=ON
+               -DCMAKE_BUILD_TYPE=${THIRD_PARTY_BUILD_TYPE}
+               ${EXTERNAL_OPTIONAL_ARGS}
+    CMAKE_CACHE_ARGS
+      -DCMAKE_INSTALL_PREFIX:PATH=${GTEST_INSTALL_DIR}
+      -DCMAKE_POSITION_INDEPENDENT_CODE:BOOL=ON
+      -DCMAKE_BUILD_TYPE:STRING=${THIRD_PARTY_BUILD_TYPE}
+    CMAKE_GENERATOR "Unix Makefiles"
+    BUILD_BYPRODUCTS ${GTEST_LIBRARIES}
+    BUILD_BYPRODUCTS ${GTEST_MAIN_LIBRARIES}
+    BUILD_BYPRODUCTS ${GMOCK_LIBRARIES})
+endif()
 add_library(gtest STATIC IMPORTED GLOBAL)
 set_property(TARGET gtest PROPERTY IMPORTED_LOCATION ${GTEST_LIBRARIES})