diff options
| author | Robert Schumacher <roschuma@microsoft.com> | 2018-10-27 12:50:27 -0700 |
|---|---|---|
| committer | Robert Schumacher <roschuma@microsoft.com> | 2018-10-27 12:50:27 -0700 |
| commit | 3270a9a469d95350b4b3492e04e28dc4ec56d467 (patch) | |
| tree | 488e73c3e56246263699162dd84f6ea6bfbfbc91 | |
| parent | 74d385ff1649cb2d3c2146b69cbafe9651db4931 (diff) | |
| download | vcpkg-3270a9a469d95350b4b3492e04e28dc4ec56d467.tar.gz vcpkg-3270a9a469d95350b4b3492e04e28dc4ec56d467.zip | |
[entityx] Fix osx build by enabling c++14
| -rw-r--r-- | ports/entityx/CONTROL | 2 | ||||
| -rw-r--r-- | ports/entityx/enable-std14.patch | 12 | ||||
| -rw-r--r-- | ports/entityx/portfile.cmake | 4 |
3 files changed, 16 insertions, 2 deletions
diff --git a/ports/entityx/CONTROL b/ports/entityx/CONTROL index cbf618e0a..dacd86ee9 100644 --- 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 new file mode 100644 index 000000000..06eff08ee --- /dev/null +++ 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 index 2c7978849..5df7da6cd 100644 --- 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( |