From e488f6c9bef0328a1ad85bc955156481f5a2b370 Mon Sep 17 00:00:00 2001 From: Jeroen Baert <3607063+Forceflow@users.noreply.github.com> Date: Fri, 22 May 2020 01:53:22 +0200 Subject: [PATCH 1/2] Removed C++11 requirement --- CMakeLists.txt | 4 ---- README.md | 2 +- test/makefile | 2 +- 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index ddc239b..ef25c4e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -6,10 +6,6 @@ project(libmorton CXX) option(LIBMORTON_BUILD_TESTS "Build unit tests for libmorton" ON) add_library(libmorton INTERFACE) -target_compile_features(libmorton - INTERFACE - cxx_std_11 - ) target_compile_options(libmorton INTERFACE # gcc and clang diff --git a/README.md b/README.md index c58b231..9f13e43 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ # Libmorton v0.2.3 [![Build Status](https://travis-ci.org/Forceflow/libmorton.svg?branch=master)](https://travis-ci.org/Forceflow/libmorton) [![license](https://img.shields.io/github/license/mashape/apistatus.svg)](https://opensource.org/licenses/MIT) [![Donate](https://img.shields.io/badge/Donate-PayPal-green.svg)](https://www.paypal.me/forceflow) - * Libmorton is a **C++11 header-only library** with methods to efficiently encode/decode 64, 32 and 16-bit Morton codes and coordinates, in 2D and 3D. *Morton order* is also known as *Z-order* or *[the Z-order curve](https://en.wikipedia.org/wiki/Z-order_curve)*. + * Libmorton is a **C++ header-only library** with methods to efficiently encode/decode 64, 32 and 16-bit Morton codes and coordinates, in 2D and 3D. *Morton order* is also known as *Z-order* or *[the Z-order curve](https://en.wikipedia.org/wiki/Z-order_curve)*. * Libmorton is a **lightweight and portable** library - the only dependencies are standard C++ headers. Architecture-specific optimizations are available. * More info and some benchmarks in these blogposts: [*Morton encoding*](http://www.forceflow.be/2013/10/07/morton-encodingdecoding-through-bit-interleaving-implementations/), [*Libmorton*](http://www.forceflow.be/2016/01/18/libmorton-a-library-for-morton-order-encoding-decoding/) and [*BMI2 instruction set*](http://www.forceflow.be/2016/11/25/using-the-bmi2-instruction-set-to-encode-decode-morton-codes/) diff --git a/test/makefile b/test/makefile index 5ee228d..e05db36 100644 --- a/test/makefile +++ b/test/makefile @@ -1,5 +1,5 @@ CXX=g++ -CFLAGS=-O3 -m64 -std=c++11 -I ../libmorton/include/ +CFLAGS=-O3 -m64 -I ../libmorton/include/ all: test bmi2 avx512 From c35214f235b41f829aba34f19ca463b470198f86 Mon Sep 17 00:00:00 2001 From: Jeroen Baert <3607063+Forceflow@users.noreply.github.com> Date: Fri, 22 May 2020 01:54:24 +0200 Subject: [PATCH 2/2] Version bump for C++11 requirement drop --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 9f13e43..9bd1abe 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# Libmorton v0.2.3 +# Libmorton v0.2.4 [![Build Status](https://travis-ci.org/Forceflow/libmorton.svg?branch=master)](https://travis-ci.org/Forceflow/libmorton) [![license](https://img.shields.io/github/license/mashape/apistatus.svg)](https://opensource.org/licenses/MIT) [![Donate](https://img.shields.io/badge/Donate-PayPal-green.svg)](https://www.paypal.me/forceflow) * Libmorton is a **C++ header-only library** with methods to efficiently encode/decode 64, 32 and 16-bit Morton codes and coordinates, in 2D and 3D. *Morton order* is also known as *Z-order* or *[the Z-order curve](https://en.wikipedia.org/wiki/Z-order_curve)*.