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 --- py/CMakeLists.txt | 7 +++---- py/pykms.i | 7 +++++-- 2 files changed, 8 insertions(+), 6 deletions(-) (limited to 'py') diff --git a/py/CMakeLists.txt b/py/CMakeLists.txt index 39e6ec6..8ad476b 100644 --- a/py/CMakeLists.txt +++ b/py/CMakeLists.txt @@ -8,15 +8,14 @@ link_directories(${LIBDRM_LIBRARY_DIRS}) pkg_check_modules(PYTHON python-3.4 REQUIRED) include_directories(${PYTHON_INCLUDE_DIRS}) -#include_directories(libkms) -#XXX -include_directories(../libkms++) +# XXX how to add these inc dirs in a proper way? +include_directories(../libkms++ ../libkmstest) #set(CMAKE_SWIG_FLAGS "-I../../libkms") set_source_files_properties(pykms.i PROPERTIES CPLUSPLUS ON) swig_add_module(pykms python pykms.i) -swig_link_libraries(pykms kms++ ${LIBDRM_LIBRARIES} ${PYTHON_LIBRARIES}) +swig_link_libraries(pykms kms++ kmstest ${LIBDRM_LIBRARIES} ${PYTHON_LIBRARIES}) add_custom_target(pyextras SOURCES test.py functest.py) diff --git a/py/pykms.i b/py/pykms.i index b9d61df..d14067e 100644 --- a/py/pykms.i +++ b/py/pykms.i @@ -1,7 +1,9 @@ %module pykms %{ #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