[entityx] Fix osx build by enabling c++14

Sondro · Oct 27, 2018 · 3270a9a · 3270a9a
1 parent 74d385f
commit 3270a9a
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 2 deletions.
diff --git a/ports/entityx/CONTROL b/ports/entityx/CONTROL
@@ -1,3 +1,3 @@
 Source: entityx
-Version: 1.2.0-1
+Version: 1.2.0-2
 Description: EntityX - A fast, type-safe C++ Entity-Component system. <https://github.com/alecthomas/entityx>
diff --git a/ports/entityx/enable-std14.patch b/ports/entityx/enable-std14.patch
@@ -0,0 +1,12 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 23f5063..1fa10b8 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -24,6 +24,7 @@ set(ENTITYX_BUILD_SHARED true CACHE BOOL "Build shared libraries?")
+ include(${CMAKE_ROOT}/Modules/CheckIncludeFile.cmake)
+ include(CheckCXXSourceCompiles)
+
++set(CMAKE_CXX_STANDARD 14)
+ # Default compiler args
+ if(0)
+ if ("${CMAKE_CXX_COMPILER_ID}" MATCHES "(GNU|.*Clang)")
diff --git a/ports/entityx/portfile.cmake b/ports/entityx/portfile.cmake
@@ -8,7 +8,9 @@ vcpkg_from_github(
     REF 1.2.0
     SHA512 682aa302cb4495666aab2c0b39a286f88cb28046bc8b2deb603402105e15e4b9692e32807077abc3f465e42a4e0f34a7e69169bc74fc5579a5c3d0e17b02fdb8
     HEAD_REF master
-    PATCHES fix-cmake.patch
+    PATCHES
+        fix-cmake.patch
+        enable-std14.patch
 )
 
 vcpkg_configure_cmake(