Merge branch 'master' of github/google/s2geometry

Merge CMake changes

CMakeLists.txt

@@ -1,11 +1,23 @@
-cmake_minimum_required(VERSION 3.1)
+cmake_minimum_required(VERSION 3.5)
+
 project(s2-geometry)
-set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
+
 include(CMakeDependentOption)
 include(CheckCXXCompilerFlag)
 include(FeatureSummary)
 include(FindPackageHandleStandardArgs)
 
+set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
+# Avoid "Policy CMP0042 is not set" warning on macOS.
+if (APPLE)
+    set(CMAKE_MACOSX_RPATH TRUE)
+endif()
+
+set(CMAKE_CXX_STANDARD 11)
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
+# No compiler-specific extensions, i.e. -std=c++11, not -std=gnu++11.
+set(CMAKE_CXX_EXTENSIONS OFF)
+
 list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/third_party/cmake")
 
 option(WITH_GFLAGS "Use gflags to change command line flags." OFF)
@@ -53,16 +65,6 @@ find_package(SWIG)
 find_package(PythonInterp)
 find_package(PythonLibs)
 
-# Avoid "Policy CMP0042 is not set" warning on macOS.
-if (APPLE)
-    set(CMAKE_MACOSX_RPATH TRUE)
-endif()
-
-set(CMAKE_CXX_STANDARD 11)
-set(CMAKE_CXX_STANDARD_REQUIRED ON)
-# No compiler-specific extensions, i.e. -std=c++11, not -std=gnu++11.
-set(CMAKE_CXX_EXTENSIONS OFF)
-
 if (WIN32)
     # Use unsigned characters
     add_definitions(-J)

src/s2/s2builderutil_lax_polygon_layer_test.cc

@@ -22,8 +22,8 @@
 #include <memory>
 #include <set>
 #include <string>
-#include "s2/third_party/absl/base/integral_types.h"
 #include <gtest/gtest.h>
+#include "s2/base/integral_types.h"
 #include "s2/third_party/absl/memory/memory.h"
 #include "s2/third_party/absl/strings/string_view.h"
 #include "s2/mutable_s2shape_index.h"