From 093b77fc295d1bc4694b32fed95da0fab78c4097 Mon Sep 17 00:00:00 2001 From: Tomi Valkeinen Date: Thu, 1 Oct 2015 21:44:49 +0300 Subject: move test utils to libkmstest library --- lua/CMakeLists.txt | 7 +++---- lua/luakms.i | 7 +++++-- 2 files changed, 8 insertions(+), 6 deletions(-) (limited to 'lua') 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" -- cgit v1.2.3