diff options
| author | Robert Schumacher <roschuma@microsoft.com> | 2018-10-20 14:11:58 -0700 |
|---|---|---|
| committer | Robert Schumacher <roschuma@microsoft.com> | 2018-10-25 10:28:08 -0700 |
| commit | 9b7d93425fd17e1dff982ee13631b4fc18c31bbf (patch) | |
| tree | 219fe9a370377287593cabb3a9087c5b9e45410d /ports/entityx/fix-cmake.patch | |
| parent | e80548e13df8353ff4b856fc1b1689901774846c (diff) | |
| download | vcpkg-9b7d93425fd17e1dff982ee13631b4fc18c31bbf.tar.gz vcpkg-9b7d93425fd17e1dff982ee13631b4fc18c31bbf.zip | |
[entityx] Fix parallel configure
Diffstat (limited to 'ports/entityx/fix-cmake.patch')
| -rw-r--r-- | ports/entityx/fix-cmake.patch | 40 |
1 files changed, 40 insertions, 0 deletions
diff --git a/ports/entityx/fix-cmake.patch b/ports/entityx/fix-cmake.patch new file mode 100644 index 000000000..143cc52b1 --- /dev/null +++ b/ports/entityx/fix-cmake.patch @@ -0,0 +1,40 @@ +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}
|