Merge pull request #48 from Forceflow/develop

Pulling in develop branch: Drop C++11 requirement
Forceflow · May 22, 2020 · d1e9aa0 · d1e9aa0
2 parents 18f908a + c35214f
commit d1e9aa0
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 7 deletions.
diff --git 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
@@ -1,7 +1,7 @@
-# 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++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
@@ -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