Browse Source

Z991239-527 #comment fix: #cmake 处理运行测试案例缺少gmock链接的问题,主要修改gtest的生成路径

gifur 5 years ago
parent
commit
f2bf9ea077
1 changed files with 5 additions and 4 deletions
  1. 5 4
      third_party/gtest/googletest/cmake/internal_utils.cmake

+ 5 - 4
third_party/gtest/googletest/cmake/internal_utils.cmake

@@ -157,12 +157,13 @@ function(cxx_library_with_type name type cxx_flags)
     PROPERTIES
     DEBUG_POSTFIX "d")
   # Set the output directory for build artifacts
+  # rewrite it for RVC build procedure @Gifur
   set_target_properties(${name}
     PROPERTIES
-    RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin"
-    LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib"
-    ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib"
-    PDB_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin")
+    RUNTIME_OUTPUT_DIRECTORY "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}"
+    LIBRARY_OUTPUT_DIRECTORY "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}"
+    ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}"
+    PDB_OUTPUT_DIRECTORY "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}")
   # make PDBs match library name
   get_target_property(pdb_debug_postfix ${name} DEBUG_POSTFIX)
   set_target_properties(${name}