move absl to pkg, fix macos x-compilation

.gitmodules

@@ -2,10 +2,6 @@
 	path = third_party/googletest
 	url = https://github.com/google/googletest.git
 	ignore = dirty
-[submodule "third_party/abseil-cpp"]
-	path = third_party/abseil-cpp
-	url = https://github.com/abseil/abseil-cpp.git
-	branch = lts_2023_08_02
 [submodule "third_party/jsoncpp"]
 	path = third_party/jsoncpp
 	url = https://github.com/open-source-parsers/jsoncpp.git

.pkg

@@ -1,4 +1,8 @@
 [zlib]
   [email protected]:motis-project/zlib.git
   branch=master
-  commit=fe8e13ffca867612951bc6baf114e5ac8b00f305
+  commit=fe8e13ffca867612951bc6baf114e5ac8b00f305
+[abseil-cpp]
+  [email protected]:motis-project/abseil-cpp.git
+  branch=master
+  commit=f2b3825f36e37fddd47c5c395096e9b1e99eca12

cmake/libprotobuf.cmake

@@ -42,5 +42,8 @@ set_target_properties(libprotobuf PROPERTIES
     VISIBILITY_INLINES_HIDDEN ON
 )
 add_library(protobuf::libprotobuf ALIAS libprotobuf)
+if (CMAKE_OSX_ARCHITECTURES)
+  set_target_properties(libprotobuf PROPERTIES OSX_ARCHITECTURES "x86_64;arm64")
+endif()
 
 target_link_libraries(libprotobuf PRIVATE utf8_validity)

cmake/libprotoc.cmake

@@ -35,3 +35,6 @@ set_target_properties(libprotoc PROPERTIES
     VISIBILITY_INLINES_HIDDEN ON
 )
 add_library(protobuf::libprotoc ALIAS libprotoc)
+if (CMAKE_OSX_ARCHITECTURES)
+  set_target_properties(libprotoc PROPERTIES OSX_ARCHITECTURES "x86_64;arm64")
+endif()

third_party/utf8_range/CMakeLists.txt

@@ -16,22 +16,19 @@ add_library (utf8_range STATIC
   range2-neon.c
   range2-sse.c
 )
+if (CMAKE_OSX_ARCHITECTURES)
+  set_target_properties(utf8_range PROPERTIES OSX_ARCHITECTURES "x86_64;arm64")
+endif()
 
 ##
 # A heavier-weight C++ wrapper that supports Abseil.
 add_library (utf8_validity STATIC utf8_validity.cc)
 
 # Load Abseil dependency.
-if (NOT TARGET absl::strings)
-  if (NOT ABSL_ROOT_DIR)
-    find_package(absl REQUIRED CONFIG)
-  else ()
-    set(ABSL_ENABLE_INSTALL ${utf8_range_ENABLE_INSTALL})
-    set(ABSL_PROPAGATE_CXX_STD ON)
-    add_subdirectory(${ABSL_ROOT_DIR} third_party/abseil-cpp)
-  endif ()
-endif ()
 target_link_libraries(utf8_validity PUBLIC absl::strings)
+if (CMAKE_OSX_ARCHITECTURES)
+  set_target_properties(utf8_validity PROPERTIES OSX_ARCHITECTURES "x86_64;arm64")
+endif()
 
 # Configure tests.
 if (utf8_range_ENABLE_TESTS)