feature/deps

.github/workflows/cmake.yml

@@ -48,45 +48,16 @@ jobs:
         run:
           conan profile update settings.compiler.libcxx=libstdc++11 default
 
-      - name: Conan install
-        working-directory: ${{github.workspace}}/build
-        run: conan install ..
-
       - name: linux package install
         if: matrix.os == 'ubuntu-latest'
         run: |
           sudo apt-get update
-          sudo apt-get install --yes --no-install-recommends libpcap-dev pkgconf golang ca-certificates libmaxminddb-dev jq
+          sudo apt-get install --yes --no-install-recommends golang ca-certificates jq
 
       - name: osx package install
         if: matrix.os == 'macos-latest'
         run: |
           brew update
-          brew install libmaxminddb
-
-      - name: PcapPlusPlus checkout
-        run: |
-          git clone https://github.com/ns1/PcapPlusPlus.git
-          cd PcapPlusPlus
-          mkdir ${{github.workspace}}/local
-
-      - name: PcapPlusPlus config (linux)
-        if: matrix.os == 'ubuntu-latest'
-        working-directory: ${{github.workspace}}/PcapPlusPlus
-        run: |
-          ./configure-linux.sh --install-dir ${{github.workspace}}/local
-
-      - name: PcapPlusPlus config (macos)
-        if: matrix.os == 'macos-latest'
-        working-directory: ${{github.workspace}}/PcapPlusPlus
-        run: |
-          ./configure-mac_os_x.sh --install-dir ${{github.workspace}}/local
-
-      - name: PcapPlusPlus install
-        working-directory: ${{github.workspace}}/PcapPlusPlus
-        run: |
-          make libs
-          make install -j 2
 
       - name: Configure CMake
         # Use a bash shell so we can use the same syntax for environment variable

3rd/CMakeLists.txt

@@ -4,3 +4,4 @@ message(STATUS "3rd party libraries")
 add_subdirectory(datasketches)
 add_subdirectory(rng)
 add_subdirectory(timer)
+add_subdirectory(libmaxminddb)

3rd/libmaxminddb/CMakeLists.txt

@@ -0,0 +1,83 @@
+cmake_minimum_required (VERSION 3.9)
+project(maxminddb
+  LANGUAGES C
+  VERSION 1.5.2
+)
+set(MAXMINDDB_SOVERSION 0.0.7)
+
+option(BUILD_SHARED_LIBS "Build shared libraries (.dll/.so) instead of static ones (.lib/.a)" OFF)
+option(BUILD_TESTING "Build test programs" ON)
+
+include(CheckTypeSize)
+check_type_size("unsigned __int128" UINT128)
+check_type_size("unsigned int __attribute__((mode(TI)))" UINT128_USING_MODE)
+if(HAVE_UINT128)
+  set(MMDB_UINT128_USING_MODE 0)
+  set(MMDB_UINT128_IS_BYTE_ARRAY 0)
+elseif(HAVE_UINT128_USING_MODE)
+  set(MMDB_UINT128_USING_MODE 1)
+  set(MMDB_UINT128_IS_BYTE_ARRAY 0)
+else()
+  set(MMDB_UINT128_USING_MODE 0)
+  set(MMDB_UINT128_IS_BYTE_ARRAY 1)
+endif()
+
+include (TestBigEndian)
+TEST_BIG_ENDIAN(IS_BIG_ENDIAN)
+
+if (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
+  set(CMAKE_POSITION_INDEPENDENT_CODE ON)
+endif()
+
+configure_file(${PROJECT_SOURCE_DIR}/include/maxminddb_config.h.cmake.in 
+               ${PROJECT_SOURCE_DIR}/include/maxminddb_config.h)
+
+add_library(maxminddb
+  src/maxminddb.c
+  src/data-pool.c
+)
+add_library(maxminddb::maxminddb ALIAS maxminddb)
+
+set_target_properties(maxminddb PROPERTIES VERSION ${MAXMINDDB_SOVERSION})
+
+target_compile_definitions(maxminddb PUBLIC PACKAGE_VERSION="${PROJECT_VERSION}")
+
+if(NOT IS_BIG_ENDIAN)
+  target_compile_definitions(maxminddb PRIVATE MMDB_LITTLE_ENDIAN=1)
+endif()
+
+if(MSVC)
+  target_compile_definitions(maxminddb PRIVATE _CRT_SECURE_NO_WARNINGS)
+endif()
+
+if(WIN32)
+  target_link_libraries(maxminddb ws2_32)
+endif()
+
+set(CMAKE_SHARED_LIBRARY_PREFIX lib)
+set(CMAKE_STATIC_LIBRARY_PREFIX lib)
+
+target_include_directories(maxminddb
+        PUBLIC
+        $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
+        $<INSTALL_INTERFACE:$<INSTALL_PREFIX>/include>
+)
+
+set(MAXMINDB_HEADERS
+  include/maxminddb.h
+  include/maxminddb_config.h
+)
+set_target_properties(maxminddb PROPERTIES PUBLIC_HEADER "${MAXMINDB_HEADERS}")
+
+install(TARGETS maxminddb
+        EXPORT maxminddb
+        ARCHIVE DESTINATION lib
+        PUBLIC_HEADER DESTINATION include/
+)
+
+# This is required to work with FetchContent
+install(EXPORT maxminddb
+        FILE maxminddb-config.cmake
+        NAMESPACE maxminddb::
+        DESTINATION lib/cmake/maxminddb)
+