Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Refactor CMake build configuration #3

Merged
merged 21 commits into from
Oct 28, 2022
Merged

Refactor CMake build configuration #3

merged 21 commits into from
Oct 28, 2022

Commits on Oct 12, 2022

  1. allow using pre-built or pre-installed s2geometry 

    Enabled by default.

For downloading and building s2geometry as part of building s2geography,
set `S2GEOGRAPHY_FETCH_S2GEOMETRY=ON`.
    @benbovy
    benbovy committed Oct 12, 2022
    Configuration menu
    Copy the full SHA
    2e483a8 View commit details
    Browse the repository at this point in the history

  2. manage absl build and install externally 

    Currently we do not support downloading, building and installing absl as
part of this project (not sure we will ever need it?).

absl supports cmake's find_package():
abseil/abseil-cpp#111
    @benbovy
    benbovy committed Oct 12, 2022
    Configuration menu
    Copy the full SHA
    4904816 View commit details
    Browse the repository at this point in the history

  3. fix typo

    @benbovy
    benbovy committed Oct 12, 2022
    Configuration menu
    Copy the full SHA
    91492be View commit details
    Browse the repository at this point in the history

  4. allow using pre-built or pre-installed googletest 

    Enabled by default.

To download and build googletest as part of building s2geography tests,
set `S2GEOGRAPHY_FETCH_GTEST=ON`.
    @benbovy
    benbovy committed Oct 12, 2022
    Configuration menu
    Copy the full SHA
    4b43b1f View commit details
    Browse the repository at this point in the history

  5. set C++ standard to c++17 

    Use `CACHE` for `CMAKE_CXX_STANDARD` so that it can be overriden.
    @benbovy
    benbovy committed Oct 12, 2022
    Configuration menu
    Copy the full SHA
    d9796d9 View commit details
    Browse the repository at this point in the history

  6. update cmake preset example

    @benbovy
    benbovy committed Oct 12, 2022
    Configuration menu
    Copy the full SHA
    c7dcd82 View commit details
    Browse the repository at this point in the history

  7. build shared libraries by default

    @benbovy
    benbovy committed Oct 12, 2022
    Configuration menu
    Copy the full SHA
    3fe9a62 View commit details
    Browse the repository at this point in the history

  8. exclude googletest from all installed targets

    @benbovy
    benbovy committed Oct 12, 2022
    Configuration menu
    Copy the full SHA
    3ce4b05 View commit details
    Browse the repository at this point in the history

  9. update CI

    @benbovy
    benbovy committed Oct 12, 2022
    Configuration menu
    Copy the full SHA
    d5f871d View commit details
    Browse the repository at this point in the history

  10. temp fix for CI run example?

    @benbovy
    benbovy committed Oct 12, 2022
    Configuration menu
    Copy the full SHA
    31cd490 View commit details
    Browse the repository at this point in the history

Commits on Oct 19, 2022

  1. review dependencies management in the CMake build 

    - Use an approach inspired by Arrow for getting s2geometry

- Always bundle GTest (update to last version to suppress the
  MACOSX_RPATH CMake warning)
    @benbovy
    benbovy committed Oct 19, 2022
    Configuration menu
    Copy the full SHA
    5404fb1 View commit details
    Browse the repository at this point in the history

  2. fix S2_SOURCE AUTO mode

    @benbovy
    benbovy committed Oct 19, 2022
    Configuration menu
    Copy the full SHA
    82a4ab3 View commit details
    Browse the repository at this point in the history

  3. quick and dirty fix for Homebrew installed S2

    @benbovy
    benbovy committed Oct 19, 2022
    Configuration menu
    Copy the full SHA
    76ab390 View commit details
    Browse the repository at this point in the history

  4. tell which version of S2 is bundled

    @benbovy
    benbovy committed Oct 19, 2022
    Configuration menu
    Copy the full SHA
    3ae033f View commit details
    Browse the repository at this point in the history

Commits on Oct 21, 2022

  1. fix openssl header homebrew + bundled

    @benbovy
    benbovy committed Oct 21, 2022
    Configuration menu
    Copy the full SHA
    ed17252 View commit details
    Browse the repository at this point in the history

  2. fix conda s2geometry 

    Prevent picking the wrong s2geometry install when it is both installed
in a conda active environment and another default system location.
    @benbovy
    benbovy committed Oct 21, 2022
    Configuration menu
    Copy the full SHA
    313679a View commit details
    Browse the repository at this point in the history

  3. fix typo

    @benbovy
    benbovy committed Oct 21, 2022
    Configuration menu
    Copy the full SHA
    c748bbe View commit details
    Browse the repository at this point in the history

  4. update README

    @benbovy
    benbovy committed Oct 21, 2022
    Configuration menu
    Copy the full SHA
    ae23ece View commit details
    Browse the repository at this point in the history

  5. fix BREW mode (variable conflict)

    @benbovy
    benbovy committed Oct 21, 2022
    Configuration menu
    Copy the full SHA
    9378cce View commit details
    Browse the repository at this point in the history

  6. more verbose (absl and s2 found)

    @benbovy
    benbovy committed Oct 21, 2022
    Configuration menu
    Copy the full SHA
    b23df44 View commit details
    Browse the repository at this point in the history

  7. fix linking error with absl shared lib

    @benbovy
    benbovy committed Oct 21, 2022
    Configuration menu
    Copy the full SHA
    a1a8270 View commit details
    Browse the repository at this point in the history