summaryrefslogtreecommitdiff
path: root/lua
diff options
context:
space:
mode:
authorTomi Valkeinen <tomi.valkeinen@iki.fi>2015-10-01 21:44:49 +0300
committerTomi Valkeinen <tomi.valkeinen@iki.fi>2015-10-01 21:44:49 +0300
commit093b77fc295d1bc4694b32fed95da0fab78c4097 (patch)
treebc9a2430aea3a33604defb00a4e62295c3cf03f2 /lua
parentf1f87468e2cf1cc3e934efb37db902a62f1fc8dc (diff)
move test utils to libkmstest library
Diffstat (limited to 'lua')
-rw-r--r--lua/CMakeLists.txt7
-rw-r--r--lua/luakms.i7
2 files changed, 8 insertions, 6 deletions
diff --git a/lua/CMakeLists.txt b/lua/CMakeLists.txt
index ba70561..584648d 100644
--- a/lua/CMakeLists.txt
+++ b/lua/CMakeLists.txt
@@ -9,12 +9,11 @@ pkg_search_module(LUA REQUIRED lua5.2 lua)
include_directories(${LUA_INCLUDE_DIRS})
link_directories(${LUA_LIBRARY_DIRS})
-#include_directories(libkms)
-#XXX
-include_directories(../libkms++)
+# XXX how to add these inc dirs in a proper way?
+include_directories(../libkms++ ../libkmstest)
set_source_files_properties(luakms.i PROPERTIES CPLUSPLUS ON)
swig_add_module(luakms lua luakms.i)
-swig_link_libraries(luakms kms++ ${LIBDRM_LIBRARIES} ${LUA_LIBRARIES})
+swig_link_libraries(luakms kms++ kmstest ${LIBDRM_LIBRARIES} ${LUA_LIBRARIES})
add_custom_target(luaextras SOURCES test.lua)
diff --git a/lua/luakms.i b/lua/luakms.i
index 2920c46..0b87857 100644
--- a/lua/luakms.i
+++ b/lua/luakms.i
@@ -1,7 +1,9 @@
%module libluakms
%{
#include "kms++.h"
-#include "utils/testpat.h"
+
+#include "testpat.h"
+
using namespace kms;
%}
@@ -18,4 +20,5 @@ using namespace kms;
%include "plane.h"
%include "connector.h"
%include "encoder.h"
-%include "utils/testpat.h"
+
+%include "testpat.h"