Downgrade abseil-cpp: 7c7754f -> 88a152a

see https://github.com/abseil/abseil-cpp/issues/283

cmake/external/abseil.CMakeLists.txt

@@ -9,11 +9,11 @@ project(abseil-cpp-download NONE)
 include(ExternalProject)
 ExternalProject_Add(abseil-cpp_project
 	GIT_REPOSITORY https://github.com/abseil/abseil-cpp
-	GIT_TAG "7c7754f"
+	GIT_TAG "88a152a"
 	SOURCE_DIR "${CMAKE_BINARY_DIR}/abseil-cpp-src"
 	BINARY_DIR "${CMAKE_BINARY_DIR}/abseil-cpp-build"
 	UPDATE_COMMAND ""
-	PATCH_COMMAND git apply "${PROJECT_SOURCE_DIR}/patches/abseil-cpp-7c7754f.patch"
+	PATCH_COMMAND git apply "${PROJECT_SOURCE_DIR}/patches/abseil-cpp-88a152a.patch"
 	CONFIGURE_COMMAND ""
 	BUILD_COMMAND ""
 	INSTALL_COMMAND ""

makefiles/Makefile.third_party.unix.mk

@@ -22,7 +22,7 @@ PROTOC_BINARY := $(shell $(WHICH) ${UNIX_PROTOC_BINARY})
 GFLAGS_TAG = 2.2.2
 GLOG_TAG = 0.3.5
 PROTOBUF_TAG = 3.6.1
-ABSL_TAG = 7c7754f
+ABSL_TAG = 88a152a
 CBC_TAG = 2.9.9
 CGL_TAG = 0.59.10
 CLP_TAG = 1.16.11

makefiles/Makefile.third_party.win.mk

@@ -38,7 +38,7 @@ ZLIB_ARCHIVE_TAG = 1211
 GFLAGS_TAG = 2.2.2
 GLOG_TAG = 0.3.5
 PROTOBUF_TAG = 3.6.1
-ABSL_TAG = 7c7754f
+ABSL_TAG = 88a152a
 CBC_TAG = 2.9.9
 CGL_TAG = 0.59.10
 CLP_TAG = 1.16.11

patches/abseil-cpp-88a152a.patch

@@ -1,5 +1,5 @@
 diff --git a/CMake/AbseilHelpers.cmake b/CMake/AbseilHelpers.cmake
-index 8fdd510..f5eb10c 100644
+index 7c81bea..792f11e 100644
 --- a/CMake/AbseilHelpers.cmake
 +++ b/CMake/AbseilHelpers.cmake
 @@ -17,6 +17,10 @@
@@ -13,7 +13,18 @@ index 8fdd510..f5eb10c 100644
  # The IDE folder for Abseil that will be used if Abseil is included in a CMake
  # project that sets
  #    set_property(GLOBAL PROPERTY USE_FOLDERS ON)
-@@ -76,14 +80,18 @@ set(ABSL_IDE_FOLDER Abseil)
+@@ -40,8 +44,8 @@ set(ABSL_IDE_FOLDER Abseil)
+ # TESTONLY: When added, this target will only be built if user passes -DABSL_RUN_TESTS=ON to CMake.
+ #
+ # Note:
+-# By default, absl_cc_library will always create a library named absl_internal_${NAME},
+-# and alias target absl::${NAME}.
++# By default, absl_cc_library will always create a library named absl_${NAME},
++# and alias target absl::${NAME}.  The absl:: form should always be used.
+ # This is to reduce namespace pollution.
+ #
+ # absl_cc_library(
+@@ -76,17 +80,17 @@ set(ABSL_IDE_FOLDER Abseil)
  # TODO: Implement "ALWAYSLINK"
  function(absl_cc_library)
    cmake_parse_arguments(ABSL_CC_LIB
@@ -25,16 +36,16 @@ index 8fdd510..f5eb10c 100644
    )
  
    if (NOT ABSL_CC_LIB_TESTONLY OR ABSL_RUN_TESTS)
--    set(_NAME "absl_${ABSL_CC_LIB_NAME}")
+-    if (ABSL_CC_LIB_PUBLIC)
 +    if (NOT ABSL_ENABLE_INSTALL)
-+      set(_NAME "absl_${ABSL_CC_LIB_NAME}")
-+    else()
+       set(_NAME "absl_${ABSL_CC_LIB_NAME}")
+     else()
+-      set(_NAME "absl_internal_${ABSL_CC_LIB_NAME}")
 +      set(_NAME "${ABSL_CC_LIB_NAME}")
-+    endif()
+     endif()
  
      # Check if this is a header-only library
-     # Note that as of February 2019, many popular OS's (for example, Ubuntu
-@@ -103,9 +111,14 @@ function(absl_cc_library)
+@@ -107,9 +111,14 @@ function(absl_cc_library)
  
      if(NOT ABSL_CC_LIB_IS_INTERFACE)
        add_library(${_NAME} STATIC "")
@@ -51,7 +62,7 @@ index 8fdd510..f5eb10c 100644
        target_compile_options(${_NAME}
          PRIVATE ${ABSL_CC_LIB_COPTS})
        target_link_libraries(${_NAME}
-@@ -129,8 +142,10 @@ function(absl_cc_library)
+@@ -133,8 +142,10 @@ function(absl_cc_library)
      else()
        # Generating header-only library
        add_library(${_NAME} INTERFACE)
@@ -64,7 +75,7 @@ index 8fdd510..f5eb10c 100644
        target_link_libraries(${_NAME}
          INTERFACE ${ABSL_CC_LIB_DEPS} ${ABSL_CC_LIB_LINKOPTS}
        )
-@@ -138,6 +153,15 @@ function(absl_cc_library)
+@@ -142,6 +153,15 @@ function(absl_cc_library)
      endif()
  
      add_library(absl::${ABSL_CC_LIB_NAME} ALIAS ${_NAME})
@@ -80,7 +91,7 @@ index 8fdd510..f5eb10c 100644
    endif()
  endfunction()
  
-@@ -194,7 +218,7 @@ function(absl_cc_test)
+@@ -198,7 +218,7 @@ function(absl_cc_test)
    add_executable(${_NAME} "")
    target_sources(${_NAME} PRIVATE ${ABSL_CC_TEST_SRCS})
    target_include_directories(${_NAME}
@@ -90,10 +101,10 @@ index 8fdd510..f5eb10c 100644
    )
    target_compile_definitions(${_NAME}
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 571e48c..6c4854a 100644
+index a56d238..3af7e8d 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -26,7 +26,19 @@ if (POLICY CMP0025)
+@@ -23,7 +23,19 @@ if (POLICY CMP0025)
    cmake_policy(SET CMP0025 NEW)
  endif()
  
@@ -114,7 +125,7 @@ index 571e48c..6c4854a 100644
  
  list(APPEND CMAKE_MODULE_PATH
    ${CMAKE_CURRENT_LIST_DIR}/CMake
-@@ -93,3 +105,44 @@ if(BUILD_TESTING)
+@@ -90,3 +102,44 @@ if(BUILD_TESTING)
  endif()
  
  add_subdirectory(absl)