Commit b5dcd892 authored by Aaron Bray's avatar Aaron Bray
Browse files

Update Protobuf and pybind

Add higher cmake min requirement
parent 86e65a30
cmake_minimum_required(VERSION 3.7)
cmake_minimum_required(VERSION 3.12)
set(CMAKE_CXX_STANDARD 11)
set(CMAKE_CXX_STANDARD_REQUIRED True)
......
......@@ -24,13 +24,17 @@ While the provided cmake superbuild automatically pulls many libraries it needs
you will still need to have the following tools installed (along with your choice of C++ compiler) :
### CMake
Currently, the code requires CMake 3.7 or greater to properly build
Currently, the code requires CMake 3.12 or greater to properly build
Go to the cmake website, <a href="https://cmake.org/download">https://cmake.org/download</a>, and download the appropriate distribution.
Ensure that cmake bin is on your PATH and available in your cmd/bash shell.
#### Building CMake
#### On Linux
If you are on a Linux-based system that requires you to build CMake for the latest version, the <a href="https://cmake.org/download/">CMake Download page</a> provides source releases.
If you are on a Debian/Ubuntu system, please install the latest cmake on your system by <a href="https://apt.kitware.com/">following thes instructions</a>.
##### Building CMake
If you need to build CMake for the latest version, the <a href="https://cmake.org/download/">CMake Download page</a> provides source releases.
The following should get you through the build process for CMake:
~~~bash
......@@ -42,10 +46,10 @@ $ sudo apt-get install libqt4-dev qt4-dev-tools libncurses5-dev
# Get the code link for the cmake download
# I used 'Copy Link Address' from my browser on the tar.gz source download link...
# Run the following commands from the directory you wish to build CMake
$ wget https://cmake.org/files/v3.11/cmake-3.11.0-rc2.tar.gz
$ wget https://github.com/Kitware/CMake/releases/download/v3.17.3/cmake-3.17.3-Linux-x86_64.tar.gz
# Extract the source
$ tar -zxvf cmake-3.11.0-rc2.tar.gz
$ cd cmake-3.11.0-rc2
$ tar -zxvf cmake-3.17.3-Linux-x86_64.tar.gz
$ cd cmake-3.17.3-Linux-x86_64.tar.gz
# Run the bootstrap, build and install the code
$ ./bootstrap --system-curl --qt-gui
# Remove the --qt-gui if you do not want to build the CMake GUI
......
......@@ -14,8 +14,8 @@ endif()
include(AddExternalProject)
define_external_dirs_ex(protobuf)
add_external_project_ex( protobuf
URL https://github.com/protocolbuffers/protobuf/releases/download/v3.10.1/protobuf-all-3.10.1.zip
URL_MD5 bbdac9517e4d92088d520dbc8a48098b
URL https://github.com/protocolbuffers/protobuf/releases/download/v3.12.2/protobuf-all-3.12.2.zip
URL_MD5 ec63c1566640a5873566e76ec8eb1398
SOURCE_SUBDIR ./cmake
CMAKE_CACHE_ARGS
-DBUILD_SHARED_LIBS:BOOL=OFF
......
......@@ -5,8 +5,8 @@
include(AddExternalProject)
define_external_dirs_ex(pybind11)
add_external_project_ex( pybind11
URL https://github.com/pybind/pybind11/archive/v2.4.3.tar.gz
URL_MD5 62254c40f89925bb894be421fe4cdef2
URL https://github.com/pybind/pybind11/archive/v2.5.0.zip
URL_MD5 dd28542bc9d676972e202482f55676e4
CMAKE_CACHE_ARGS
-DCMAKE_INSTALL_PREFIX:STRING=${pybind11_PREFIX}/install
-DPYBIND11_TEST:BOOL=OFF
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment