summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 0bc5bbd)
raw | patch | inline | side by side (parent: 0bc5bbd)
author | Tomi Valkeinen <tomi.valkeinen@ti.com> | |
Mon, 23 May 2016 06:54:08 +0000 (09:54 +0300) | ||
committer | Tomi Valkeinen <tomi.valkeinen@ti.com> | |
Mon, 23 May 2016 06:54:08 +0000 (09:54 +0300) |
26 files changed:
diff --git a/CMakeLists.txt b/CMakeLists.txt
index b968102bdfd8e537d198ee4a28b1b16ba7bf495d..f1e13c2a0ac8ed51fc8ba3853e6ce19fbfa6f1ba 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
enable_testing()
add_subdirectory(libkms++)
-add_subdirectory(libkmstest)
-add_subdirectory(tests)
+add_subdirectory(libkms++util)
+add_subdirectory(utils)
if(LIBKMS_ENABLE_KMSCUBE)
add_subdirectory(kmscube)
diff --git a/kmscube/CMakeLists.txt b/kmscube/CMakeLists.txt
index 15b4dbfd76b862e69f07483fdf828809f2f2f747..b6bac29422681e1a8af81a674affdbb7ad658c2e 100644 (file)
--- a/kmscube/CMakeLists.txt
+++ b/kmscube/CMakeLists.txt
add_executable (kmscube cube.cpp cube.h cube-egl.cpp cube-egl.h cube-gles2.cpp cube-gles2.h
cube-null.cpp cube-gbm.cpp cube-x11.cpp cube-wl.cpp
esTransform.c esTransform.h)
-target_link_libraries(kmscube kms++ kmstest
+target_link_libraries(kmscube kms++ kms++util
${LIBDRM_LIBRARIES}
${GLESv2_LIBRARIES}
${EGL_LIBRARIES}
diff --git a/libkms++util/CMakeLists.txt b/libkms++util/CMakeLists.txt
--- /dev/null
@@ -0,0 +1,5 @@
+file(GLOB SRCS "*.cpp" "*.h")
+add_library(kms++util ${SRCS})
+
+target_link_libraries(kms++util kms++)
+target_include_directories(kms++util PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
diff --git a/libkmstest/color.cpp b/libkms++util/color.cpp
diff --git a/libkmstest/color.h b/libkms++util/color.h
similarity index 100%
rename from libkmstest/cpuframebuffer.cpp
rename to libkms++util/cpuframebuffer.cpp
rename from libkmstest/cpuframebuffer.cpp
rename to libkms++util/cpuframebuffer.cpp
similarity index 100%
rename from libkmstest/cpuframebuffer.h
rename to libkms++util/cpuframebuffer.h
rename from libkmstest/cpuframebuffer.h
rename to libkms++util/cpuframebuffer.h
similarity index 100%
rename from libkmstest/extcpuframebuffer.cpp
rename to libkms++util/extcpuframebuffer.cpp
rename from libkmstest/extcpuframebuffer.cpp
rename to libkms++util/extcpuframebuffer.cpp
similarity index 100%
rename from libkmstest/extcpuframebuffer.h
rename to libkms++util/extcpuframebuffer.h
rename from libkmstest/extcpuframebuffer.h
rename to libkms++util/extcpuframebuffer.h
diff --git a/libkmstest/kmstest.h b/libkms++util/kmstest.h
diff --git a/libkmstest/opts.cpp b/libkms++util/opts.cpp
diff --git a/libkmstest/opts.h b/libkms++util/opts.h
diff --git a/libkmstest/test.h b/libkms++util/test.h
diff --git a/libkmstest/CMakeLists.txt b/libkmstest/CMakeLists.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-file(GLOB SRCS "*.cpp" "*.h")
-add_library(kmstest ${SRCS})
-
-target_link_libraries(kmstest kms++)
-target_include_directories(kmstest PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
diff --git a/py/CMakeLists.txt b/py/CMakeLists.txt
index f48ec2ca480a6a0a0c19d529387e6a133171f444..562a3cff4572225a298d996d54a44b5ddc86c312 100644 (file)
--- a/py/CMakeLists.txt
+++ b/py/CMakeLists.txt
include_directories(${PROJECT_SOURCE_DIR}/ext/pybind11/include)
-add_library(pykms SHARED pykms.cpp pykmsbase.cpp pykmstest.cpp)
-target_link_libraries(pykms kms++ kmstest ${LIBDRM_LIBRARIES})
+add_library(pykms SHARED pykms.cpp pykmsbase.cpp pykmsutil.cpp)
+target_link_libraries(pykms kms++ kms++util ${LIBDRM_LIBRARIES})
# Don't add a 'lib' prefix to the shared library
set_target_properties(pykms PROPERTIES PREFIX "")
diff --git a/py/pykmstest.cpp b/py/pykmsutil.cpp
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
--- a/tests/CMakeLists.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-include_directories(${LIBDRM_INCLUDE_DIRS})
-link_directories(${LIBDRM_LIBRARY_DIRS})
-
-add_executable (db db.cpp)
-target_link_libraries(db kms++ kmstest ${LIBDRM_LIBRARIES})
-
-add_executable (testpat testpat.cpp)
-target_link_libraries(testpat kms++ kmstest ${LIBDRM_LIBRARIES})
-
-add_executable (kmsview kmsview.cpp)
-target_link_libraries(kmsview kms++ kmstest ${LIBDRM_LIBRARIES})
-
-add_executable (kmsprint kmsprint.cpp)
-target_link_libraries(kmsprint kms++ kmstest ${LIBDRM_LIBRARIES})
-
-add_executable (fbtestpat fbtestpat.cpp)
-target_link_libraries(fbtestpat kmstest)
-
-add_executable (kmscapture kmscapture.cpp)
-target_link_libraries(kmscapture kms++ kmstest ${LIBDRM_LIBRARIES})
diff --git a/utils/CMakeLists.txt b/utils/CMakeLists.txt
--- /dev/null
+++ b/utils/CMakeLists.txt
@@ -0,0 +1,20 @@
+include_directories(${LIBDRM_INCLUDE_DIRS})
+link_directories(${LIBDRM_LIBRARY_DIRS})
+
+add_executable (db db.cpp)
+target_link_libraries(db kms++ kms++util ${LIBDRM_LIBRARIES})
+
+add_executable (testpat testpat.cpp)
+target_link_libraries(testpat kms++ kms++util ${LIBDRM_LIBRARIES})
+
+add_executable (kmsview kmsview.cpp)
+target_link_libraries(kmsview kms++ kms++util ${LIBDRM_LIBRARIES})
+
+add_executable (kmsprint kmsprint.cpp)
+target_link_libraries(kmsprint kms++ kms++util ${LIBDRM_LIBRARIES})
+
+add_executable (fbtestpat fbtestpat.cpp)
+target_link_libraries(fbtestpat kms++util)
+
+add_executable (kmscapture kmscapture.cpp)
+target_link_libraries(kmscapture kms++ kms++util ${LIBDRM_LIBRARIES})
diff --git a/tests/db.cpp b/utils/db.cpp
diff --git a/tests/fbtestpat.cpp b/utils/fbtestpat.cpp
diff --git a/tests/kmscapture.cpp b/utils/kmscapture.cpp
diff --git a/tests/kmsprint.cpp b/utils/kmsprint.cpp
diff --git a/tests/kmsview.cpp b/utils/kmsview.cpp
diff --git a/tests/testpat.cpp b/utils/testpat.cpp