Use CMake FetchContent to install pybind11 (watercompany#31)

Luke-Larsen · May 18, 2020 · e0de0b2 · e0de0b2
1 parent bef9f1e
commit e0de0b2
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 15 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -72,7 +72,6 @@ jobs:
         CIBW_TEST_REQUIRES: pytest
         CIBW_TEST_COMMAND: py.test -v {project}/tests -s
 
-
     - name: Upload artifacts
       uses: actions/upload-artifact@v1
       with:

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,4 +1,4 @@
-CMAKE_MINIMUM_REQUIRED(VERSION 3.1.0 FATAL_ERROR)
+CMAKE_MINIMUM_REQUIRED(VERSION 3.14 FATAL_ERROR)
 set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_POSITION_INDEPENDENT_CODE ON)
 
@@ -26,7 +26,15 @@ include_directories(
 
 add_library(fse ${FSE_FILES})
 
-add_subdirectory(lib/pybind11)
+# CMake 3.14+
+include(FetchContent)
+
+FetchContent_Declare(
+  pybind11-src
+  GIT_REPOSITORY https://github.com/pybind/pybind11.git
+  GIT_TAG        v2.5.0
+)
+FetchContent_MakeAvailable(pybind11-src)
 
 pybind11_add_module(chiapos ${CMAKE_CURRENT_SOURCE_DIR}/python-bindings/chiapos.cpp)
 

diff --git a/README.md b/README.md
@@ -22,6 +22,7 @@ format, move to chacha8, and otherwise improve plotting performance.
 ### Compile
 
 ```bash
+# Optional as CMake will install pybind11 src
 git submodule update --init --recursive
 
 mkdir -p build && cd build
@@ -86,11 +87,11 @@ py.test ./tests -s -v
 ## ci Building
 The primary build process for this repository is to use GitHub Actions to
 build binary wheels for MacOS, Linux, and Windows and publish them with
-a source wheel on PyPi. See `.github/workflows/build.yml`. setup.py adds
-a dependency on [pybind11](https://github.com/pybind/pybind11) by invoking git
-to check out the pybind submodules. Building is then managed by
-[cibuildwheel](https://github.com/joerick/cibuildwheel). Further installation
-is then available via `pip install chiapos` e.g.
+a source wheel on PyPi. See `.github/workflows/build.yml`. CMake uses
+[FetchContent](https://cmake.org/cmake/help/latest/module/FetchContent.html)
+to download [pybind11](https://github.com/pybind/pybind11). Building is then
+managed by [cibuildwheel](https://github.com/joerick/cibuildwheel). Further
+installation is then available via `pip install chiapos` e.g.
 
 ## Contributing and workflow
 Contributions are welcome and more details are available in chia-blockchain's

diff --git a/lib/pybind11 b/lib/pybind11
diff --git a/setup.py b/setup.py
@@ -25,12 +25,6 @@ def run(self):
                                + " the following extensions: "
                                + ", ".join(e.name for e in self.extensions))
 
-        """
-        Work around pybind11's need to be on the filesystem
-        """
-        if os.path.exists('.gitmodules'):
-            out = subprocess.run(['git', 'submodule', 'update', '--init', '--recursive'])
-
         if platform.system() == "Windows":
             cmake_version = LooseVersion(
                     re.search(r'version\s*([\d.]+)', out.decode()).group(1))
+26 −0		docs/advanced/classes.rst
+28 −0		docs/advanced/functions.rst
+12 −8		docs/compiling.rst
+1 −1		docs/conf.py
+39 −4		include/pybind11/attr.h
+15 −4		include/pybind11/cast.h
+3 −1		include/pybind11/detail/class.h
+1 −1		include/pybind11/detail/common.h
+2 −2		include/pybind11/numpy.h
+35 −24		include/pybind11/pybind11.h
+6 −1		include/pybind11/pytypes.h
+1 −1		pybind11/_version.py
+8 −0		tests/test_class.cpp
+18 −0		tests/test_class.py
+24 −0		tests/test_kwargs_and_defaults.cpp
+38 −0		tests/test_kwargs_and_defaults.py
+3 −0		tests/test_sequences_and_iterators.cpp
+19 −0		tests/test_sequences_and_iterators.py
+6 −0		tests/test_tagbased_polymorphic.cpp
+7 −0		tools/mkdoc.py
+2 −2		tools/pybind11Config.cmake.in
+24 −8		tools/pybind11Tools.cmake