Repository: mesos
Updated Branches:
  refs/heads/master 1fc0551db -> d6b117e6e


CMake: Fixed the http_parser patch command.

The Posix/Linux builds for the http_parser did not apply the
patch to rename a header field.

The Windows build had an incorect path to the patch file.


Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/d6b117e6
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/d6b117e6
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/d6b117e6

Branch: refs/heads/master
Commit: d6b117e6e1f8ccb876db91261fe604ce826bf791
Parents: 1fc0551
Author: Joseph Wu <josep...@apache.org>
Authored: Wed Nov 23 14:35:24 2016 -0800
Committer: Joseph Wu <josep...@apache.org>
Committed: Wed Nov 23 14:41:18 2016 -0800

----------------------------------------------------------------------
 3rdparty/CMakeLists.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/mesos/blob/d6b117e6/3rdparty/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/3rdparty/CMakeLists.txt b/3rdparty/CMakeLists.txt
index 770a382..092184b 100755
--- a/3rdparty/CMakeLists.txt
+++ b/3rdparty/CMakeLists.txt
@@ -124,11 +124,11 @@ endif (NOT WIN32)
 set(HTTP_PARSER_UPDATE_CMD ${CMAKE_COMMAND} -E copy 
${MESOS_3RDPARTY_SRC}/http-parser/CMakeLists.txt.template 
${HTTP_PARSER_ROOT}/CMakeLists.txt)
 
 if (NOT WIN32)
-  set(HTTP_PARSER_PATCH_CMD  ${CMAKE_NOOP})
+  PATCH_CMD(${MESOS_3RDPARTY_SRC}/http-parser-${HTTP_PARSER_VERSION}.patch 
HTTP_PARSER_PATCH_CMD)
 elseif (WIN32)
   # Set the patch command which will utilize patch.exe under
   # `\Users\<user>\AppData\Local\Temp with no elevation prompt`
-  set(HTTP_PARSER_PATCH_CMD ${PATCHEXE_LOCATION} --binary -p1 < 
${MESOS_3RDPARTY_BIN}/http-parser-${HTTP_PARSER_VERSION}.patch)
+  set(HTTP_PARSER_PATCH_CMD ${PATCHEXE_LOCATION} --binary -p1 < 
${MESOS_3RDPARTY_SRC}/http-parser-${HTTP_PARSER_VERSION}.patch)
 endif (NOT WIN32)
 
 set(LIBEVENT_CMAKE_ARGS

Reply via email to