kms++util: split to subdirs
authorTomi Valkeinen <tomi.valkeinen@ti.com>
Sat, 11 Jun 2016 19:39:24 +0000 (22:39 +0300)
committerTomi Valkeinen <tomi.valkeinen@ti.com>
Sat, 11 Jun 2016 19:41:01 +0000 (22:41 +0300)
31 files changed:
kms++util/CMakeLists.txt
kms++util/inc/kms++util/color.h [moved from kms++util/color.h with 100% similarity]
kms++util/inc/kms++util/cpuframebuffer.h [moved from kms++util/cpuframebuffer.h with 100% similarity]
kms++util/inc/kms++util/extcpuframebuffer.h [moved from kms++util/extcpuframebuffer.h with 100% similarity]
kms++util/inc/kms++util/kms++util.h [moved from kms++util/kms++util.h with 88% similarity]
kms++util/inc/kms++util/opts.h [moved from kms++util/opts.h with 100% similarity]
kms++util/inc/kms++util/stopwatch.h [moved from kms++util/stopwatch.h with 100% similarity]
kms++util/inc/kms++util/strhelpers.h [moved from kms++util/strhelpers.h with 100% similarity]
kms++util/src/color.cpp [moved from kms++util/color.cpp with 98% similarity]
kms++util/src/colorbar.cpp [moved from kms++util/colorbar.cpp with 98% similarity]
kms++util/src/cpuframebuffer.cpp [moved from kms++util/cpuframebuffer.cpp with 95% similarity]
kms++util/src/drawing.cpp [moved from kms++util/drawing.cpp with 98% similarity]
kms++util/src/extcpuframebuffer.cpp [moved from kms++util/extcpuframebuffer.cpp with 95% similarity]
kms++util/src/font_8x8.h [moved from kms++util/font_8x8.h with 100% similarity]
kms++util/src/helpers.cpp [moved from kms++util/helpers.cpp with 94% similarity]
kms++util/src/opts.cpp [moved from kms++util/opts.cpp with 98% similarity]
kms++util/src/strhelpers.cpp [moved from kms++util/strhelpers.cpp with 92% similarity]
kms++util/src/testpat.cpp [moved from kms++util/testpat.cpp with 98% similarity]
kmscube/cube-egl.cpp
kmscube/cube-gbm.cpp
kmscube/cube-gles2.cpp
kmscube/cube-null.cpp
kmscube/cube-x11.cpp
kmscube/cube.cpp
py/pykmsutil.cpp
utils/fbtestpat.cpp
utils/kmsblank.cpp
utils/kmscapture.cpp
utils/kmsprint.cpp
utils/kmsview.cpp
utils/testpat.cpp

index 533b4467b2509529a9aad6153206a9350b2524a7..3977f7083d641fd31f933510c2c71ac92ea98ec6 100644 (file)
@@ -1,5 +1,9 @@
-file(GLOB SRCS "*.cpp" "*.h")
+file(GLOB SRCS "src/*.cpp" "src/*.h" "inc/kms++util/*.h")
 add_library(kms++util ${SRCS})
 
+target_include_directories(kms++util PUBLIC
+    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/inc>
+    $<INSTALL_INTERFACE:include>
+    PRIVATE src)
+
 target_link_libraries(kms++util kms++ pthread)
-target_include_directories(kms++util PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
similarity index 88%
rename from kms++util/kms++util.h
rename to kms++util/inc/kms++util/kms++util.h
index 0c07d1824bc7b0204854c8ad75a99e381e0306fd..ca3c4069f855b34990ff987e56f45beb80f0a4b2 100644 (file)
@@ -2,7 +2,13 @@
 
 #include <kms++/kms++.h>
 
-#include "color.h"
+#include <kms++util/color.h>
+#include <kms++util/strhelpers.h>
+#include <kms++util/cpuframebuffer.h>
+#include <kms++util/extcpuframebuffer.h>
+#include <kms++util/stopwatch.h>
+#include <kms++util/opts.h>
+
 #include <cstdio>
 #include <cstdlib>
 
similarity index 98%
rename from kms++util/color.cpp
rename to kms++util/src/color.cpp
index 490ff64c54ab1dd651f742f843a57c3535d1decc..4bfc33e0a170dcc6c599da3851a8946a747e7bc7 100644 (file)
@@ -1,4 +1,4 @@
-#include "color.h"
+#include <kms++util/color.h>
 
 namespace kms
 {
similarity index 98%
rename from kms++util/colorbar.cpp
rename to kms++util/src/colorbar.cpp
index 9e6e68dd1ae7f96f7c61ceb450e9bf940efc5483..bca8dc6c57a3a0b71eab90f378382e0b0d4b000b 100644 (file)
@@ -1,7 +1,7 @@
 #include <cstdint>
 
 #include <kms++/kms++.h>
-#include "kms++util.h"
+#include <kms++util/kms++util.h>
 
 namespace kms
 {
similarity index 95%
rename from kms++util/cpuframebuffer.cpp
rename to kms++util/src/cpuframebuffer.cpp
index 1f14ddc92502c49071c8e48d7445fdfa20118d3f..d3565964a9043577f384d58bbd29b1afcf2d0d7d 100644 (file)
@@ -1,6 +1,6 @@
 #include <map>
 
-#include "cpuframebuffer.h"
+#include <kms++util/cpuframebuffer.h>
 
 using namespace std;
 
similarity index 98%
rename from kms++util/drawing.cpp
rename to kms++util/src/drawing.cpp
index 2ca567c1847041b2de8ed1fa10ec92cef608b402..a5377be5f1586f466cdd2b3884ec5d06bb60bd28 100644 (file)
@@ -1,6 +1,6 @@
 
 #include <kms++/kms++.h>
-#include <kms++util.h>
+#include <kms++util/kms++util.h>
 
 using namespace std;
 
similarity index 95%
rename from kms++util/extcpuframebuffer.cpp
rename to kms++util/src/extcpuframebuffer.cpp
index bd0b10c9ad475d7a1cffb949e6d6bfad4b795b32..232c778ae74cda8593457a2c5808cee1ed964887 100644 (file)
@@ -1,6 +1,5 @@
 
-#include "extcpuframebuffer.h"
-#include "kms++util.h"
+#include <kms++util/kms++util.h>
 
 using namespace std;
 
similarity index 94%
rename from kms++util/helpers.cpp
rename to kms++util/src/helpers.cpp
index 4aa3194c60ab7d4abfdc4b800b40cb6092ddf03c..2bf3a4fdce028273741cf42110938f66255108ce 100644 (file)
@@ -1,5 +1,4 @@
-#include "kms++util.h"
-#include "strhelpers.h"
+#include <kms++util/kms++util.h>
 
 using namespace std;
 
similarity index 98%
rename from kms++util/opts.cpp
rename to kms++util/src/opts.cpp
index 4ea31f8bb498d4151b490c0c3ef41c514605f3c5..afef45225805fa73a1e4774917bb82e449608f06 100644 (file)
@@ -3,7 +3,7 @@
 #include <unistd.h>
 #include <getopt.h>
 
-#include "opts.h"
+#include <kms++util/opts.h>
 
 using namespace std;
 
similarity index 92%
rename from kms++util/strhelpers.cpp
rename to kms++util/src/strhelpers.cpp
index f18c749b99586f6a9add2360fe3e0823c11a5e5b..f59bb6da8519393f2b0b46daac5ca8016329f533 100644 (file)
@@ -1,4 +1,4 @@
-#include "strhelpers.h"
+#include <kms++util/strhelpers.h>
 
 #include <algorithm>
 #include <stdarg.h>
similarity index 98%
rename from kms++util/testpat.cpp
rename to kms++util/src/testpat.cpp
index 7a2e4d38199abf4b0c0e532c85599f91a6e75eca..cbe611d53caa7c6f985f514f0fc7e038739f4ea7 100644 (file)
@@ -6,9 +6,7 @@
 #include <thread>
 
 #include <kms++/kms++.h>
-#include <kms++util.h>
-#include <cpuframebuffer.h>
-#include "stopwatch.h"
+#include <kms++util/kms++util.h>
 
 using namespace std;
 
index 310ff072be0a7f1108ad08a72c78607974796083..7dcfa0b69912c55984472cc0e25ac460eb36a29d 100644 (file)
@@ -1,7 +1,7 @@
 #include "cube-egl.h"
 #include "cube.h"
 
-#include <kms++util.h>
+#include <kms++util/kms++util.h>
 
 using namespace std;
 
index 93ebece90a38cf34b28b8a6097a0a69dc7c354ca..15286847d6940d02016ab381e4c8ab0426c7766a 100644 (file)
@@ -10,7 +10,7 @@
 #include <gbm.h>
 
 #include <kms++/kms++.h>
-#include <kms++util.h>
+#include <kms++util/kms++util.h>
 #include "cube-egl.h"
 #include "cube-gles2.h"
 
index bda2f59008f48fcd6c04dc67919f8d924b58888b..05567ea88aa78f6fe056ef9a1355e7dca24907fc 100644 (file)
@@ -2,7 +2,7 @@
 #include "cube-gles2.h"
 #include "cube.h"
 
-#include <kms++util.h>
+#include <kms++util/kms++util.h>
 
 using namespace std;
 
index 64fbb45f573fce091fe494635e6a6493e1eb89a8..f8f209175c067035f2a9f6539e559d1a1ea77600 100644 (file)
@@ -4,7 +4,7 @@
 #include "cube-gles2.h"
 #include "cube.h"
 
-#include <kms++util.h>
+#include <kms++util/kms++util.h>
 
 using namespace std;
 
index dde4f61148214347522c0561fa2cc744fb2ad566..dca59c875551acbba527cb31e68f4e4cdcd7761a 100644 (file)
@@ -6,7 +6,7 @@
 #include "cube-egl.h"
 #include "cube-gles2.h"
 
-#include <kms++util.h>
+#include <kms++util/kms++util.h>
 
 using namespace std;
 
index 9aa8a84f72d78e94fdec04d2a4e1d72d6b35aafb..4129554db6da023223b7c3745a0d1a04e4bea25e 100644 (file)
@@ -26,8 +26,7 @@
 /* Based on a egl cube test app originally written by Arvin Schnell */
 
 #include "cube.h"
-#include <opts.h>
-#include <kms++util.h>
+#include <kms++util/kms++util.h>
 
 using namespace std;
 
index f060bdf0936f5791f56bbfbaff850f307f21a36e..5ee1d4e7445311bb01dd4d7b18303de666583ce9 100644 (file)
@@ -1,7 +1,7 @@
 #include <pybind11/pybind11.h>
 #include <pybind11/stl.h>
 #include <kms++/kms++.h>
-#include <kms++util.h>
+#include <kms++util/kms++util.h>
 
 namespace py = pybind11;
 
index de707d6106f9cd112b5c84e1793cbcccd7b721b4..0538ed071a93678a52533296125ebdee57c787f0 100644 (file)
@@ -11,8 +11,7 @@
 
 #include <linux/fb.h>
 
-#include <kms++util.h>
-#include <extcpuframebuffer.h>
+#include <kms++util/kms++util.h>
 
 using namespace kms;
 
index 864f2691c10ee0dedfa04b708c1c4930ad600fc6..4909826b5184bb1a5fc6c4894fbb04c5664b210f 100644 (file)
@@ -3,8 +3,7 @@
 #include <algorithm>
 
 #include <kms++/kms++.h>
-#include <kms++util.h>
-#include "opts.h"
+#include <kms++util/kms++util.h>
 
 using namespace std;
 using namespace kms;
index dc65f1e6bb7f50f79da52061ed902f4a52f94725..b4c3e881f1393a4f14aa564bd3d1acc88ba341a4 100644 (file)
@@ -10,8 +10,7 @@
 #include <glob.h>
 
 #include <kms++/kms++.h>
-#include <kms++util.h>
-#include <opts.h>
+#include <kms++util/kms++util.h>
 
 #define CAMERA_BUF_QUEUE_SIZE  3
 #define MAX_CAMERA             9
index 7c8e01f96382583f17d64be2c1748d38654a69b6..7e3fd3b22b1ac299a0be1658b47a2854721c3778 100644 (file)
@@ -6,9 +6,7 @@
 #include <inttypes.h>
 
 #include <kms++/kms++.h>
-#include "opts.h"
-#include "kms++util.h"
-#include "strhelpers.h"
+#include <kms++util/kms++util.h>
 
 using namespace std;
 using namespace kms;
index 8efcecd9d9f0436cba27e8a7fff38ad2a5a830fd..b503f0a0ecfc6fe91ae9533712993fda07952502 100644 (file)
@@ -3,8 +3,7 @@
 #include <unistd.h>
 
 #include <kms++/kms++.h>
-#include <kms++util.h>
-#include <opts.h>
+#include <kms++util/kms++util.h>
 
 using namespace std;
 using namespace kms;
index 4fe8d0bb31f40f8b3800aabb7904262bf21e352c..ef56a80e5dbeee06a7e3b7c3924fe5de268cdf26 100644 (file)
@@ -8,8 +8,7 @@
 #include <kms++/kms++.h>
 #include <kms++/modedb.h>
 
-#include <kms++util.h>
-#include <opts.h>
+#include <kms++util/kms++util.h>
 
 using namespace std;
 using namespace kms;