summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefan Radomski <github@mintwerk.de>2017-06-01 14:43:42 (GMT)
committerStefan Radomski <github@mintwerk.de>2017-06-01 14:43:42 (GMT)
commit30d29bc9f20b508a3177bbd9d89593fc47d9a4b6 (patch)
tree021fd1ec37f7c3fa2068b612cdd9137c9b1e1a56
parentcfa566ab882b416396aba38252992903658f2a8b (diff)
downloaduscxml-30d29bc9f20b508a3177bbd9d89593fc47d9a4b6.zip
uscxml-30d29bc9f20b508a3177bbd9d89593fc47d9a4b6.tar.gz
uscxml-30d29bc9f20b508a3177bbd9d89593fc47d9a4b6.tar.bz2
Some more Windows polishing
-rw-r--r--CMakeLists.txt8
-rw-r--r--src/bindings/swig/lua/CMakeLists.txt4
2 files changed, 7 insertions, 5 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2cd37de..83af0f6 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -415,11 +415,13 @@ endif()
OPTION(WITH_DM_LUA "Do search for the Lua libraries" ON)
if (WITH_DM_LUA)
if (WIN32)
- # LuaForWindows https://code.google.com/archive/p/luaforwindows/downloads
- # set(ENV{LUA_DIR} "C:/Program Files (x86)/Lua/5.1/")
+ # LuaForWindows:
+ # https://code.google.com/archive/p/luaforwindows/downloads
+ # https://github.com/rjpcomputing/luaforwindows/releases
+ set(ENV{LUA_DIR} "C:/Program Files (x86)/Lua/5.1/")
# http://luabinaries.sourceforge.net/download.html
- set(ENV{LUA_DIR} "C:/Program Files (x86)/Lua/5.3/")
+ # set(ENV{LUA_DIR} "C:/Program Files (x86)/Lua/5.3/")
endif()
find_package(Lua)
if (LUA_FOUND)
diff --git a/src/bindings/swig/lua/CMakeLists.txt b/src/bindings/swig/lua/CMakeLists.txt
index 93accad..ac408c9 100644
--- a/src/bindings/swig/lua/CMakeLists.txt
+++ b/src/bindings/swig/lua/CMakeLists.txt
@@ -1,8 +1,8 @@
# generate JNI library and create a jar
# Make from within Eclipse fails miserably with the whole thing
-find_package(Lua51)
-if(LUA51_FOUND)
+find_package(Lua)
+if (LUA_FOUND)
include_directories(${LUA_INCLUDE_DIR})
else()
message(STATUS "No Lua headers found - not building Lua wrappers")