diff options
| author | Robert Schumacher <roschuma@microsoft.com> | 2019-11-22 09:47:40 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-11-22 09:47:40 -0800 |
| commit | 45f4b820e5743b89bca3508ba2028cdd5d8bbd17 (patch) | |
| tree | f874a8c4a7392309bdbb86447288597ec0a4a281 /ports/entityx | |
| parent | 62d67d3bf8eeff1afa8009041fd08b8822676b7b (diff) | |
| parent | 8831e8f25f1ff6546ee4a5291b91d599421637b3 (diff) | |
| download | vcpkg-45f4b820e5743b89bca3508ba2028cdd5d8bbd17.tar.gz vcpkg-45f4b820e5743b89bca3508ba2028cdd5d8bbd17.zip | |
Merge branch 'master' into vcpkg_nuget
Diffstat (limited to 'ports/entityx')
| -rw-r--r-- | ports/entityx/CONTROL | 2 | ||||
| -rw-r--r-- | ports/entityx/enable-std14.patch | 12 | ||||
| -rw-r--r-- | ports/entityx/portfile.cmake | 2 |
3 files changed, 1 insertions, 15 deletions
diff --git a/ports/entityx/CONTROL b/ports/entityx/CONTROL index 9585262b8..281a4206b 100644 --- a/ports/entityx/CONTROL +++ b/ports/entityx/CONTROL @@ -1,4 +1,4 @@ Source: entityx -Version: 1.3.0-1 +Version: 1.3.0-2 Description: EntityX - A fast, type-safe C++ Entity-Component system. Homepage: https://github.com/alecthomas/entityx diff --git a/ports/entityx/enable-std14.patch b/ports/entityx/enable-std14.patch deleted file mode 100644 index 06eff08ee..000000000 --- a/ports/entityx/enable-std14.patch +++ /dev/null @@ -1,12 +0,0 @@ -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 b55f5f602..326a21bdf 100644 --- a/ports/entityx/portfile.cmake +++ b/ports/entityx/portfile.cmake @@ -8,8 +8,6 @@ vcpkg_from_github( REF 1.3.0 SHA512 724a3f421f802e60a1106ff8a69435c9a9da14e35c3e88565bbc17bff3a17f2d9771818aac83320cc4f14de0ec770a66f1eb7cbf4318f43abd516c63e077c07d HEAD_REF master - PATCHES - enable-std14.patch ) vcpkg_configure_cmake( |