From 82ae00d85f3111ee77bf15dbcb97264f177a66ec Mon Sep 17 00:00:00 2001 From: Michael Trinkala Date: Wed, 22 Jul 2015 09:25:59 -0700 Subject: [PATCH] Fix the packaging of the Visual studio build - remove wlua - install the luasb.dll --- cmake/externals.cmake | 2 +- src/CMakeLists.txt | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/cmake/externals.cmake b/cmake/externals.cmake index 49b3009..0d3e4e7 100644 --- a/cmake/externals.cmake +++ b/cmake/externals.cmake @@ -65,7 +65,7 @@ else() externalproject_add( ${LUA_PROJECT} GIT_REPOSITORY https://github.com/trink/lua.git - GIT_TAG 477c0b5ae0932953ee41ab7cd24098c23e3e33c3 + GIT_TAG 57d3e82ef270b20dc976f3a6001439589c807793 CMAKE_ARGS ${SANDBOX_CMAKE_ARGS} INSTALL_ARGS ${INST_ARGS} ) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index c71b3e1..a603a26 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -28,6 +28,7 @@ add_dependencies(lua_cuckoo_filter luasandbox) if(MSVC) add_definitions(-D_CRT_SECURE_NO_WARNINGS) set(LUA_SANDBOX_LIBS "${EP_BASE}/lib/luasb.lib") + install(DIRECTORY "${EP_BASE}/bin/" DESTINATION lib COMPONENT core PATTERN "*.dll") elseif(MINGW) add_definitions(-D_MINGW) set(LUA_SANDBOX_LIBS "${EP_BASE}/bin/libluasb.dll")