|
| 1 | +diff --git a/CMake/AbseilHelpers.cmake b/CMake/AbseilHelpers.cmake |
| 2 | +index 624a3c7..8d0493d 100644 |
| 3 | +--- a/CMake/AbseilHelpers.cmake |
| 4 | ++++ b/CMake/AbseilHelpers.cmake |
| 5 | +@@ -345,7 +345,7 @@ Cflags: -I\${includedir}${PC_CFLAGS}\n") |
| 6 | + endif() |
| 7 | + endif() |
| 8 | + |
| 9 | +- if(ABSL_ENABLE_INSTALL) |
| 10 | ++ if(ABSL_ENABLE_INSTALL AND NOT ABSL_CC_LIB_TESTONLY) |
| 11 | + install(TARGETS ${_NAME} EXPORT ${PROJECT_NAME}Targets |
| 12 | + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} |
| 13 | + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} |
| 14 | +diff --git a/CMakeLists.txt b/CMakeLists.txt |
| 15 | +index 1e7c856..a3c3dae 100644 |
| 16 | +--- a/CMakeLists.txt |
| 17 | ++++ b/CMakeLists.txt |
| 18 | +@@ -145,7 +145,7 @@ if((BUILD_TESTING AND ABSL_BUILD_TESTING) OR ABSL_BUILD_TEST_HELPERS) |
| 19 | + add_library(GTest::gmock ALIAS gmock) |
| 20 | + add_library(GTest::gmock_main ALIAS gmock_main) |
| 21 | + else() |
| 22 | +- message(FATAL_ERROR "ABSL_USE_EXTERNAL_GOOGLETEST is ON and ABSL_FIND_GOOGLETEST is OFF, which means that the top-level project must build the Google Test project. However, the target gtest was not found.") |
| 23 | ++ message(WARNING "ABSL_USE_EXTERNAL_GOOGLETEST is ON and ABSL_FIND_GOOGLETEST is OFF, which means that the top-level project must build the Google Test project. However, the target gtest was not found.") |
| 24 | + endif() |
| 25 | + endif() |
| 26 | + else() |
| 27 | +diff --git a/absl/flags/declare.h b/absl/flags/declare.h |
| 28 | +index 8d2a856..a154046 100644 |
| 29 | +--- a/absl/flags/declare.h |
| 30 | ++++ b/absl/flags/declare.h |
| 31 | +@@ -59,10 +59,15 @@ ABSL_NAMESPACE_END |
| 32 | + |
| 33 | + // Internal implementation of ABSL_DECLARE_FLAG to allow macro expansion of its |
| 34 | + // arguments. Clients must use ABSL_DECLARE_FLAG instead. |
| 35 | ++#if defined(_MSC_VER) |
| 36 | ++#define ABSL_DECLARE_FLAG_INTERNAL(type, name) \ |
| 37 | ++ extern absl::Flag<type> FLAGS_##name |
| 38 | ++#else |
| 39 | + #define ABSL_DECLARE_FLAG_INTERNAL(type, name) \ |
| 40 | + extern absl::Flag<type> FLAGS_##name; \ |
| 41 | + namespace absl /* block flags in namespaces */ {} \ |
| 42 | + /* second redeclaration is to allow applying attributes */ \ |
| 43 | + extern absl::Flag<type> FLAGS_##name |
| 44 | ++#endif // _MSC_VER |
| 45 | + |
| 46 | + #endif // ABSL_FLAGS_DECLARE_H_ |
0 commit comments