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

This commit is contained in:
Robert Schumacher 2018-10-27 12:50:27 -07:00
parent 74d385ff16
commit 3270a9a469
3 changed files with 16 additions and 2 deletions

View File

@ -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>

View File

@ -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)")

View File

@ -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(