Merge pull request #1920 from mozilla-services/cmake_3_5_1

rafrombrc · rafrombrc · commit c6b7bec6ca91 · 2016-04-28T11:41:04.000-07:00
Pull in the lua_sandbox cmake 3.5 fix
diff --git a/cmake/externals.cmake b/cmake/externals.cmake
@@ -19,7 +19,7 @@ if(INCLUDE_SANDBOX)
     externalproject_add(
         ${SANDBOX_PACKAGE}
         GIT_REPOSITORY https://github.com/mozilla-services/lua_sandbox.git
-        GIT_TAG 5e22edfcc4bed35305dc0d358e681509dfb9944b
+        GIT_TAG 7abcb7c661c13c970fb9e928e428551671244911
         CMAKE_ARGS ${SANDBOX_ARGS}
         INSTALL_DIR ${PROJECT_PATH}
     )

Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ if(INCLUDE_SANDBOX)`
`19`	`19`	`externalproject_add(`
`20`	`20`	`${SANDBOX_PACKAGE}`
`21`	`21`	`GIT_REPOSITORY https://github.com/mozilla-services/lua_sandbox.git`
`22`		`- GIT_TAG 5e22edfcc4bed35305dc0d358e681509dfb9944b`
	`22`	`+ GIT_TAG 7abcb7c661c13c970fb9e928e428551671244911`
`23`	`23`	`CMAKE_ARGS ${SANDBOX_ARGS}`
`24`	`24`	`INSTALL_DIR ${PROJECT_PATH}`
`25`	`25`	`)`