9cbf09afdf
* abseil-cpp 20250512.0 * protobuf v31.0 * re2 2024-07-02 * googletest 1.17.0 * benchmark 1.9.2 devNote: to fix a patch not working ```sh cd ~/.../ortools_repo cmake -S. -Bbuild -DBUILD_DEPS=ON -DBUILD_EXAMPLES=OFF -DBUILD_SAMPLES=OFF -DBUILD_TESTING=ON pushd build/_deps/absl-src git apply --3way ~/.../ortools_repo/patches/abseil-cpp-20250512.0.patch git mergetool git diff HEAD -u > ~/.../ortools_repo/patches/abseil-cpp-20250512.0.patch cd .. rm -rf absl-* popd <repeat> ```
118 lines
5.2 KiB
Diff
118 lines
5.2 KiB
Diff
diff --git a/googlemock/include/gmock/internal/gmock-port.h b/googlemock/include/gmock/internal/gmock-port.h
|
|
index e9d9e32..ca55646 100644
|
|
--- a/googlemock/include/gmock/internal/gmock-port.h
|
|
+++ b/googlemock/include/gmock/internal/gmock-port.h
|
|
@@ -85,11 +85,11 @@
|
|
|
|
// Macros for declaring flags.
|
|
#define GMOCK_DECLARE_bool_(name) \
|
|
- ABSL_DECLARE_FLAG(bool, GMOCK_FLAG_NAME_(name))
|
|
+ GTEST_API_ ABSL_DECLARE_FLAG(bool, GMOCK_FLAG_NAME_(name))
|
|
#define GMOCK_DECLARE_int32_(name) \
|
|
- ABSL_DECLARE_FLAG(int32_t, GMOCK_FLAG_NAME_(name))
|
|
+ GTEST_API_ ABSL_DECLARE_FLAG(int32_t, GMOCK_FLAG_NAME_(name))
|
|
#define GMOCK_DECLARE_string_(name) \
|
|
- ABSL_DECLARE_FLAG(std::string, GMOCK_FLAG_NAME_(name))
|
|
+ GTEST_API_ ABSL_DECLARE_FLAG(std::string, GMOCK_FLAG_NAME_(name))
|
|
|
|
#define GMOCK_FLAG_GET(name) ::absl::GetFlag(GMOCK_FLAG(name))
|
|
#define GMOCK_FLAG_SET(name, value) \
|
|
diff --git a/googletest/cmake/internal_utils.cmake b/googletest/cmake/internal_utils.cmake
|
|
index 580ac1c..b338398 100644
|
|
--- a/googletest/cmake/internal_utils.cmake
|
|
+++ b/googletest/cmake/internal_utils.cmake
|
|
@@ -11,6 +11,7 @@
|
|
# - The functions/macros defined in this file may depend on Google
|
|
# Test and Google Mock's option() definitions, and thus must be
|
|
# called *after* the options have been defined.
|
|
+include(GNUInstallDirs)
|
|
|
|
# Tweaks CMake's default compiler/linker settings to suit Google Test's needs.
|
|
#
|
|
@@ -170,11 +171,11 @@ function(cxx_library_with_type name type cxx_flags)
|
|
# Set the output directory for build artifacts.
|
|
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"
|
|
- COMPILE_PDB_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib")
|
|
+ RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_BINDIR}"
|
|
+ LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_LIBDIR}"
|
|
+ ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_LIBDIR}"
|
|
+ PDB_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_BINDIR}"
|
|
+ COMPILE_PDB_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_LIBDIR}")
|
|
# Make PDBs match library name.
|
|
get_target_property(pdb_debug_postfix ${name} DEBUG_POSTFIX)
|
|
set_target_properties(${name}
|
|
@@ -185,11 +186,19 @@ function(cxx_library_with_type name type cxx_flags)
|
|
COMPILE_PDB_NAME_DEBUG "${name}${pdb_debug_postfix}")
|
|
|
|
if (BUILD_SHARED_LIBS OR type STREQUAL "SHARED")
|
|
- set_target_properties(${name}
|
|
- PROPERTIES
|
|
- COMPILE_DEFINITIONS "GTEST_CREATE_SHARED_LIBRARY=1")
|
|
+ target_compile_definitions(${name} PRIVATE
|
|
+ "GTEST_CREATE_SHARED_LIBRARY=1")
|
|
target_compile_definitions(${name} INTERFACE
|
|
- $<INSTALL_INTERFACE:GTEST_LINKED_AS_SHARED_LIBRARY=1>)
|
|
+ $<BUILD_INTERFACE:GTEST_LINKED_AS_SHARED_LIBRARY=1>
|
|
+ $<INSTALL_INTERFACE:GTEST_LINKED_AS_SHARED_LIBRARY=1>
|
|
+ )
|
|
+ if(APPLE)
|
|
+ set_target_properties(${name} PROPERTIES
|
|
+ INSTALL_RPATH "@loader_path")
|
|
+ elseif(UNIX)
|
|
+ set_target_properties(${name} PROPERTIES
|
|
+ INSTALL_RPATH "$ORIGIN")
|
|
+ endif()
|
|
endif()
|
|
if (DEFINED GTEST_HAS_PTHREAD)
|
|
target_link_libraries(${name} PUBLIC Threads::Threads)
|
|
@@ -226,9 +235,8 @@ function(cxx_executable_with_flags name cxx_flags libs)
|
|
COMPILE_FLAGS "${cxx_flags}")
|
|
endif()
|
|
if (BUILD_SHARED_LIBS)
|
|
- set_target_properties(${name}
|
|
- PROPERTIES
|
|
- COMPILE_DEFINITIONS "GTEST_LINKED_AS_SHARED_LIBRARY=1")
|
|
+ target_compile_definitions(${name} PRIVATE
|
|
+ "GTEST_LINKED_AS_SHARED_LIBRARY=1")
|
|
endif()
|
|
# To support mixing linking in static and dynamic libraries, link each
|
|
# library in with an extra call to target_link_libraries.
|
|
diff --git a/googletest/include/gtest/internal/gtest-port.h b/googletest/include/gtest/internal/gtest-port.h
|
|
index 8d27c2c..890c953 100644
|
|
--- a/googletest/include/gtest/internal/gtest-port.h
|
|
+++ b/googletest/include/gtest/internal/gtest-port.h
|
|
@@ -867,10 +867,10 @@ typedef struct _RTL_CRITICAL_SECTION GTEST_CRITICAL_SECTION;
|
|
#ifndef GTEST_API_
|
|
|
|
#ifdef _MSC_VER
|
|
-#if defined(GTEST_LINKED_AS_SHARED_LIBRARY) && GTEST_LINKED_AS_SHARED_LIBRARY
|
|
-#define GTEST_API_ __declspec(dllimport)
|
|
-#elif defined(GTEST_CREATE_SHARED_LIBRARY) && GTEST_CREATE_SHARED_LIBRARY
|
|
+#if defined(GTEST_CREATE_SHARED_LIBRARY) && GTEST_CREATE_SHARED_LIBRARY
|
|
#define GTEST_API_ __declspec(dllexport)
|
|
+#elif defined(GTEST_LINKED_AS_SHARED_LIBRARY) && GTEST_LINKED_AS_SHARED_LIBRARY
|
|
+#define GTEST_API_ __declspec(dllimport)
|
|
#endif
|
|
#elif GTEST_HAVE_ATTRIBUTE_(visibility)
|
|
#define GTEST_API_ __attribute__((visibility("default")))
|
|
@@ -2287,11 +2287,11 @@ using TimeInMillis = int64_t; // Represents time in milliseconds.
|
|
|
|
// Macros for declaring flags.
|
|
#define GTEST_DECLARE_bool_(name) \
|
|
- ABSL_DECLARE_FLAG(bool, GTEST_FLAG_NAME_(name))
|
|
+ GTEST_API_ ABSL_DECLARE_FLAG(bool, GTEST_FLAG_NAME_(name))
|
|
#define GTEST_DECLARE_int32_(name) \
|
|
- ABSL_DECLARE_FLAG(int32_t, GTEST_FLAG_NAME_(name))
|
|
+ GTEST_API_ ABSL_DECLARE_FLAG(int32_t, GTEST_FLAG_NAME_(name))
|
|
#define GTEST_DECLARE_string_(name) \
|
|
- ABSL_DECLARE_FLAG(std::string, GTEST_FLAG_NAME_(name))
|
|
+ GTEST_API_ ABSL_DECLARE_FLAG(std::string, GTEST_FLAG_NAME_(name))
|
|
|
|
#define GTEST_FLAG_SAVER_ ::absl::FlagSaver
|
|
|