diff options
| author | Cheney Wang <38240633+Cheney-W@users.noreply.github.com> | 2019-06-04 17:23:04 +0800 |
|---|---|---|
| committer | Robert Schumacher <roschuma@microsoft.com> | 2019-06-04 02:23:04 -0700 |
| commit | 8fe8cf468bb936d331fc72d0b388ed36a7e61dd0 (patch) | |
| tree | 44e1e2c581b204bdc4a47845a29b864de786b791 /ports/entityx/fix-cmake.patch | |
| parent | 99ee8b71a81b352e187cfa677ff1220936931d0e (diff) | |
| download | vcpkg-8fe8cf468bb936d331fc72d0b388ed36a7e61dd0.tar.gz vcpkg-8fe8cf468bb936d331fc72d0b388ed36a7e61dd0.zip | |
[entityx][entt] Disable parallel configure (#6736)
* [entityx][entt] Disable parallel configure
* [entityx][entt] Remove the invalid patch
Diffstat (limited to 'ports/entityx/fix-cmake.patch')
| -rw-r--r-- | ports/entityx/fix-cmake.patch | 40 |
1 files changed, 0 insertions, 40 deletions
diff --git a/ports/entityx/fix-cmake.patch b/ports/entityx/fix-cmake.patch deleted file mode 100644 index 143cc52b1..000000000 --- a/ports/entityx/fix-cmake.patch +++ /dev/null @@ -1,40 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 87309bf..23f5063 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -25,6 +25,7 @@ include(${CMAKE_ROOT}/Modules/CheckIncludeFile.cmake)
- include(CheckCXXSourceCompiles)
-
- # Default compiler args
-+if(0)
- if ("${CMAKE_CXX_COMPILER_ID}" MATCHES "(GNU|.*Clang)")
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pedantic -Werror -Wall -Wextra -Wno-unused-parameter -Wno-error=unused-variable -Wno-error=sign-compare -std=c++11")
- set(CMAKE_CXX_FLAGS_DEBUG "-O0 -g")
-@@ -41,6 +42,7 @@ elseif("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC")
- set(CMAKE_CXX_FLAGS_RELEASE "/Ox -DNDEBUG")
- set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "/Ox /Zi /FS /DEBUG")
- endif()
-+endif()
-
- # if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
- # set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Weverything -Wno-c++98-compat -Wno-shadow -Wno-padded -Wno-missing-noreturn -Wno-global-constructors")
-@@ -156,9 +158,9 @@ endif (ENTITYX_BUILD_TESTING)
-
- configure_file(
- ${CMAKE_CURRENT_SOURCE_DIR}/entityx/config.h.in
-- ${CMAKE_CURRENT_SOURCE_DIR}/entityx/config.h
-+ ${CMAKE_CURRENT_BINARY_DIR}/entityx/config.h
- )
--
-+include_directories(${CMAKE_CURRENT_BINARY_DIR})
-
- if (NOT WINDOWS OR CYGWIN)
- set(entityx_libs -lentityx)
-@@ -179,6 +181,7 @@ install(
- DESTINATION "include"
- FILES_MATCHING PATTERN "*.h"
- )
-+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/entityx/config.h DESTINATION include/entityx)
-
- install(
- TARGETS ${install_libs}
|
