File/dir renames
authorTomi Valkeinen <tomi.valkeinen@ti.com>
Mon, 23 May 2016 06:54:08 +0000 (09:54 +0300)
committerTomi Valkeinen <tomi.valkeinen@ti.com>
Mon, 23 May 2016 06:54:08 +0000 (09:54 +0300)
26 files changed:
CMakeLists.txt
kmscube/CMakeLists.txt
libkms++util/CMakeLists.txt [new file with mode: 0644]
libkms++util/color.cpp [moved from libkmstest/color.cpp with 100% similarity]
libkms++util/color.h [moved from libkmstest/color.h with 100% similarity]
libkms++util/colorbar.cpp [moved from libkmstest/colorbar.cpp with 100% similarity]
libkms++util/cpuframebuffer.cpp [moved from libkmstest/cpuframebuffer.cpp with 100% similarity]
libkms++util/cpuframebuffer.h [moved from libkmstest/cpuframebuffer.h with 100% similarity]
libkms++util/extcpuframebuffer.cpp [moved from libkmstest/extcpuframebuffer.cpp with 100% similarity]
libkms++util/extcpuframebuffer.h [moved from libkmstest/extcpuframebuffer.h with 100% similarity]
libkms++util/kmstest.h [moved from libkmstest/kmstest.h with 100% similarity]
libkms++util/opts.cpp [moved from libkmstest/opts.cpp with 100% similarity]
libkms++util/opts.h [moved from libkmstest/opts.h with 100% similarity]
libkms++util/test.h [moved from libkmstest/test.h with 100% similarity]
libkms++util/testpat.cpp [moved from libkmstest/testpat.cpp with 100% similarity]
libkmstest/CMakeLists.txt [deleted file]
py/CMakeLists.txt
py/pykmsutil.cpp [moved from py/pykmstest.cpp with 100% similarity]
tests/CMakeLists.txt [deleted file]
utils/CMakeLists.txt [new file with mode: 0644]
utils/db.cpp [moved from tests/db.cpp with 100% similarity]
utils/fbtestpat.cpp [moved from tests/fbtestpat.cpp with 100% similarity]
utils/kmscapture.cpp [moved from tests/kmscapture.cpp with 100% similarity]
utils/kmsprint.cpp [moved from tests/kmsprint.cpp with 100% similarity]
utils/kmsview.cpp [moved from tests/kmsview.cpp with 100% similarity]
utils/testpat.cpp [moved from tests/testpat.cpp with 100% similarity]

index b968102bdfd8e537d198ee4a28b1b16ba7bf495d..f1e13c2a0ac8ed51fc8ba3853e6ce19fbfa6f1ba 100644 (file)
@@ -38,8 +38,8 @@ pkg_check_modules(LIBDRM libdrm REQUIRED)
 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)
index 15b4dbfd76b862e69f07483fdf828809f2f2f747..b6bac29422681e1a8af81a674affdbb7ad658c2e 100644 (file)
@@ -32,7 +32,7 @@ link_directories(
 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
new file mode 100644 (file)
index 0000000..d08ec84
--- /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})
similarity index 100%
rename from libkmstest/color.cpp
rename to libkms++util/color.cpp
similarity index 100%
rename from libkmstest/color.h
rename to libkms++util/color.h
similarity index 100%
rename from libkmstest/kmstest.h
rename to libkms++util/kmstest.h
similarity index 100%
rename from libkmstest/opts.cpp
rename to libkms++util/opts.cpp
similarity index 100%
rename from libkmstest/opts.h
rename to libkms++util/opts.h
similarity index 100%
rename from libkmstest/test.h
rename to libkms++util/test.h
diff --git a/libkmstest/CMakeLists.txt b/libkmstest/CMakeLists.txt
deleted file mode 100644 (file)
index e7980ee..0000000
+++ /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})
index f48ec2ca480a6a0a0c19d529387e6a133171f444..562a3cff4572225a298d996d54a44b5ddc86c312 100644 (file)
@@ -10,8 +10,8 @@ endif()
 
 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 "")
similarity index 100%
rename from py/pykmstest.cpp
rename to py/pykmsutil.cpp
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
deleted file mode 100644 (file)
index bb335d3..0000000
+++ /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
new file mode 100644 (file)
index 0000000..3a7115e
--- /dev/null
@@ -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})
similarity index 100%
rename from tests/db.cpp
rename to utils/db.cpp
similarity index 100%
rename from tests/fbtestpat.cpp
rename to utils/fbtestpat.cpp
similarity index 100%
rename from tests/kmscapture.cpp
rename to utils/kmscapture.cpp
similarity index 100%
rename from tests/kmsprint.cpp
rename to utils/kmsprint.cpp
similarity index 100%
rename from tests/kmsview.cpp
rename to utils/kmsview.cpp
similarity index 100%
rename from tests/testpat.cpp
rename to utils/testpat.cpp