summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 736b295)
raw | patch | inline | side by side (parent: 736b295)
author | Tomi Valkeinen <tomi.valkeinen@ti.com> | |
Sat, 11 Jun 2016 18:46:24 +0000 (21:46 +0300) | ||
committer | Tomi Valkeinen <tomi.valkeinen@ti.com> | |
Sat, 11 Jun 2016 18:46:24 +0000 (21:46 +0300) |
56 files changed:
diff --git a/kms++/CMakeLists.txt b/kms++/CMakeLists.txt
index 4409b8b0bfec4bcf4697e54814a864384c7ffde0..d983964aa46e39ddc9c4fe79b2f42893c91db2d4 100644 (file)
--- a/kms++/CMakeLists.txt
+++ b/kms++/CMakeLists.txt
include_directories(${LIBDRM_INCLUDE_DIRS})
link_directories(${LIBDRM_LIBRARY_DIRS})
-file(GLOB SRCS "*.cpp" "*.h")
+file(GLOB SRCS "src/*.cpp" "src/*.h" "inc/kms++/*.h")
add_library(kms++ ${SRCS})
+target_include_directories(kms++ PUBLIC
+ $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/inc>
+ $<INSTALL_INTERFACE:include>
+ PRIVATE src)
+
target_link_libraries(kms++ ${LIBDRM_LIBRARIES})
-target_include_directories(kms++ PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
diff --git a/kms++/atomicreq.h b/kms++/inc/kms++/atomicreq.h
diff --git a/kms++/blob.h b/kms++/inc/kms++/blob.h
diff --git a/kms++/card.h b/kms++/inc/kms++/card.h
diff --git a/kms++/connector.h b/kms++/inc/kms++/connector.h
diff --git a/kms++/crtc.h b/kms++/inc/kms++/crtc.h
diff --git a/kms++/decls.h b/kms++/inc/kms++/decls.h
diff --git a/kms++/drmobject.h b/kms++/inc/kms++/drmobject.h
similarity index 100%
rename from kms++/dumbframebuffer.h
rename to kms++/inc/kms++/dumbframebuffer.h
rename from kms++/dumbframebuffer.h
rename to kms++/inc/kms++/dumbframebuffer.h
diff --git a/kms++/encoder.h b/kms++/inc/kms++/encoder.h
diff --git a/kms++/kms++.h b/kms++/inc/kms++/kms++.h
diff --git a/kms++/modedb.h b/kms++/inc/kms++/modedb.h
similarity index 100%
rename from kms++/pagefliphandler.h
rename to kms++/inc/kms++/pagefliphandler.h
rename from kms++/pagefliphandler.h
rename to kms++/inc/kms++/pagefliphandler.h
diff --git a/kms++/pipeline.h b/kms++/inc/kms++/pipeline.h
diff --git a/kms++/plane.h b/kms++/inc/kms++/plane.h
diff --git a/kms++/property.h b/kms++/inc/kms++/property.h
diff --git a/kms++/videomode.h b/kms++/inc/kms++/videomode.h
diff --git a/kms++/atomicreq.cpp b/kms++/src/atomicreq.cpp
similarity index 97%
rename from kms++/atomicreq.cpp
rename to kms++/src/atomicreq.cpp
index 3aa2ff638dd3d2090e1ec33fba048a9a49b291a0..01934ae1358b80756b6372c04b0873e5465d547d 100644 (file)
rename from kms++/atomicreq.cpp
rename to kms++/src/atomicreq.cpp
index 3aa2ff638dd3d2090e1ec33fba048a9a49b291a0..01934ae1358b80756b6372c04b0873e5465d547d 100644 (file)
--- a/kms++/atomicreq.cpp
+++ b/kms++/src/atomicreq.cpp
#include <xf86drm.h>
#include <xf86drmMode.h>
-#include "atomicreq.h"
-#include "property.h"
-#include "card.h"
+#include <kms++/kms++.h>
#ifndef DRM_CLIENT_CAP_ATOMIC
diff --git a/kms++/blob.cpp b/kms++/src/blob.cpp
similarity index 97%
rename from kms++/blob.cpp
rename to kms++/src/blob.cpp
index 10a71c62d87853c0222d32fc25974d41f9d19929..e1cd1f8a6d2989fa592cafd06f381c07a155e2a1 100644 (file)
rename from kms++/blob.cpp
rename to kms++/src/blob.cpp
index 10a71c62d87853c0222d32fc25974d41f9d19929..e1cd1f8a6d2989fa592cafd06f381c07a155e2a1 100644 (file)
--- a/kms++/blob.cpp
+++ b/kms++/src/blob.cpp
#include <xf86drm.h>
#include <xf86drmMode.h>
-#include "kms++.h"
+#include <kms++/kms++.h>
using namespace std;
diff --git a/kms++/card.cpp b/kms++/src/card.cpp
similarity index 99%
rename from kms++/card.cpp
rename to kms++/src/card.cpp
index 918c8250ee3f61f9ffd057cf946e7f5fc487d2b2..0a34d14222ebd71629183cf8becd7c0754aaa580 100644 (file)
rename from kms++/card.cpp
rename to kms++/src/card.cpp
index 918c8250ee3f61f9ffd057cf946e7f5fc487d2b2..0a34d14222ebd71629183cf8becd7c0754aaa580 100644 (file)
--- a/kms++/card.cpp
+++ b/kms++/src/card.cpp
#include <xf86drm.h>
#include <xf86drmMode.h>
-#include "kms++.h"
+#include <kms++/kms++.h>
using namespace std;
diff --git a/kms++/connector.cpp b/kms++/src/connector.cpp
similarity index 99%
rename from kms++/connector.cpp
rename to kms++/src/connector.cpp
index 0f471e1b0e9bde25891bbb5a2700dbc87e3d2ee8..ec37d5d3562222743abaef4a22055e4689c660cd 100644 (file)
rename from kms++/connector.cpp
rename to kms++/src/connector.cpp
index 0f471e1b0e9bde25891bbb5a2700dbc87e3d2ee8..ec37d5d3562222743abaef4a22055e4689c660cd 100644 (file)
--- a/kms++/connector.cpp
+++ b/kms++/src/connector.cpp
#include <fcntl.h>
#include <cassert>
-#include "kms++.h"
+#include <kms++/kms++.h>
#include "helpers.h"
using namespace std;
diff --git a/kms++/crtc.cpp b/kms++/src/crtc.cpp
similarity index 99%
rename from kms++/crtc.cpp
rename to kms++/src/crtc.cpp
index 6cbdf0cf878800565a94b389fb557cd1e4c5367d..bad7d315aa854ce199e9eadb0825823b45fc78ac 100644 (file)
rename from kms++/crtc.cpp
rename to kms++/src/crtc.cpp
index 6cbdf0cf878800565a94b389fb557cd1e4c5367d..bad7d315aa854ce199e9eadb0825823b45fc78ac 100644 (file)
--- a/kms++/crtc.cpp
+++ b/kms++/src/crtc.cpp
#include <fcntl.h>
#include <cassert>
-#include "kms++.h"
+#include <kms++/kms++.h>
#include "helpers.h"
using namespace std;
diff --git a/kms++/drmobject.cpp b/kms++/src/drmobject.cpp
similarity index 95%
rename from kms++/drmobject.cpp
rename to kms++/src/drmobject.cpp
index 8abecc725bb955d6da237d664b316bd8e474d1cf..f94fc5deeac5f38ff412061accee7460d7c0f06a 100644 (file)
rename from kms++/drmobject.cpp
rename to kms++/src/drmobject.cpp
index 8abecc725bb955d6da237d664b316bd8e474d1cf..f94fc5deeac5f38ff412061accee7460d7c0f06a 100644 (file)
--- a/kms++/drmobject.cpp
+++ b/kms++/src/drmobject.cpp
#include <xf86drm.h>
#include <xf86drmMode.h>
-#include "kms++.h"
+#include <kms++/kms++.h>
using namespace std;
similarity index 98%
rename from kms++/drmpropobject.cpp
rename to kms++/src/drmpropobject.cpp
index 50f87a7cdf3b42421817f0fc71d1958dc9980e2d..f2edf8bbfe30a883b9bcf26b5621b15886d166e1 100644 (file)
rename from kms++/drmpropobject.cpp
rename to kms++/src/drmpropobject.cpp
index 50f87a7cdf3b42421817f0fc71d1958dc9980e2d..f2edf8bbfe30a883b9bcf26b5621b15886d166e1 100644 (file)
--- a/kms++/drmpropobject.cpp
#include <xf86drm.h>
#include <xf86drmMode.h>
-#include "kms++.h"
+#include <kms++/kms++.h>
using namespace std;
similarity index 99%
rename from kms++/dumbframebuffer.cpp
rename to kms++/src/dumbframebuffer.cpp
index fcd01d0d41576c0f3ef67ae957fada86c9862f8c..d2f5db2fbb4bf1305582c1705d79c07178ba40f4 100644 (file)
rename from kms++/dumbframebuffer.cpp
rename to kms++/src/dumbframebuffer.cpp
index fcd01d0d41576c0f3ef67ae957fada86c9862f8c..d2f5db2fbb4bf1305582c1705d79c07178ba40f4 100644 (file)
#include <drm.h>
#include <drm_mode.h>
-#include "kms++.h"
+#include <kms++/kms++.h>
#define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]))
diff --git a/kms++/encoder.cpp b/kms++/src/encoder.cpp
similarity index 98%
rename from kms++/encoder.cpp
rename to kms++/src/encoder.cpp
index 1ed2d5cc5831dc08c86528b513040b250ebd70f0..2168f2ff511076dfd7013b1420db36b1020c3f5f 100644 (file)
rename from kms++/encoder.cpp
rename to kms++/src/encoder.cpp
index 1ed2d5cc5831dc08c86528b513040b250ebd70f0..2168f2ff511076dfd7013b1420db36b1020c3f5f 100644 (file)
--- a/kms++/encoder.cpp
+++ b/kms++/src/encoder.cpp
#include <xf86drm.h>
#include <xf86drmMode.h>
-#include "kms++.h"
+#include <kms++/kms++.h>
using namespace std;
similarity index 98%
rename from kms++/extframebuffer.cpp
rename to kms++/src/extframebuffer.cpp
index 352c1a771fae23e9cf50162b18b42ee42c189c20..0ade4548283cbac3f642b72cce21f9d651b6202c 100644 (file)
rename from kms++/extframebuffer.cpp
rename to kms++/src/extframebuffer.cpp
index 352c1a771fae23e9cf50162b18b42ee42c189c20..0ade4548283cbac3f642b72cce21f9d651b6202c 100644 (file)
--- a/kms++/extframebuffer.cpp
#include <xf86drm.h>
#include <xf86drmMode.h>
-#include "kms++.h"
+#include <kms++/kms++.h>
using namespace std;
similarity index 96%
rename from kms++/framebuffer.cpp
rename to kms++/src/framebuffer.cpp
index bf9ab01f10a74e1f0a4a3b3e5868da10dbe2fa00..a7f589c00b8066d8513cb4340945602a3ada7921 100644 (file)
rename from kms++/framebuffer.cpp
rename to kms++/src/framebuffer.cpp
index bf9ab01f10a74e1f0a4a3b3e5868da10dbe2fa00..a7f589c00b8066d8513cb4340945602a3ada7921 100644 (file)
--- a/kms++/framebuffer.cpp
#include <xf86drm.h>
#include <xf86drmMode.h>
-#include "kms++.h"
+#include <kms++/kms++.h>
using namespace std;
diff --git a/kms++/helpers.cpp b/kms++/src/helpers.cpp
similarity index 97%
rename from kms++/helpers.cpp
rename to kms++/src/helpers.cpp
index 715e757969cc94d5741245e0b2748e6f75344fc5..8bd082bab9c84b99d9648d36a5beb2e1147c4ee5 100644 (file)
rename from kms++/helpers.cpp
rename to kms++/src/helpers.cpp
index 715e757969cc94d5741245e0b2748e6f75344fc5..8bd082bab9c84b99d9648d36a5beb2e1147c4ee5 100644 (file)
--- a/kms++/helpers.cpp
+++ b/kms++/src/helpers.cpp
-#include "connector.h"
+#include <kms++/kms++.h>
#include "helpers.h"
#include <cstring>
diff --git a/kms++/helpers.h b/kms++/src/helpers.h
diff --git a/kms++/modedb.cpp b/kms++/src/modedb.cpp
similarity index 95%
rename from kms++/modedb.cpp
rename to kms++/src/modedb.cpp
index 53dcfcf113fd7c388d1facd17ba5ed1ecfa2220f..24d6f63d1d22de2e9e64d9ddf0734f00fcda2be2 100644 (file)
rename from kms++/modedb.cpp
rename to kms++/src/modedb.cpp
index 53dcfcf113fd7c388d1facd17ba5ed1ecfa2220f..24d6f63d1d22de2e9e64d9ddf0734f00fcda2be2 100644 (file)
--- a/kms++/modedb.cpp
+++ b/kms++/src/modedb.cpp
#include <xf86drm.h>
#include <stdexcept>
-#include "modedb.h"
-#include "videomode.h"
+#include <kms++/modedb.h>
using namespace std;
diff --git a/kms++/modedb_cea.cpp b/kms++/src/modedb_cea.cpp
similarity index 99%
rename from kms++/modedb_cea.cpp
rename to kms++/src/modedb_cea.cpp
index a1f4ab9d6edbfc7dc3aab9e173e7100470aabe79..a105dd8d24144d9d7b46088f4a22f40886413fc0 100644 (file)
rename from kms++/modedb_cea.cpp
rename to kms++/src/modedb_cea.cpp
index a1f4ab9d6edbfc7dc3aab9e173e7100470aabe79..a105dd8d24144d9d7b46088f4a22f40886413fc0 100644 (file)
--- a/kms++/modedb_cea.cpp
+++ b/kms++/src/modedb_cea.cpp
* DEALINGS IN THE SOFTWARE.
*/
-#include "modedb.h"
+#include <kms++/modedb.h>
#include <xf86drm.h>
diff --git a/kms++/modedb_dmt.cpp b/kms++/src/modedb_dmt.cpp
similarity index 99%
rename from kms++/modedb_dmt.cpp
rename to kms++/src/modedb_dmt.cpp
index 6c74c5ec3896c38ff2c194852d2ae065fd43c2f3..e3f2ad5e60f1cd8f7baecfd6428bb476a3ec98ea 100644 (file)
rename from kms++/modedb_dmt.cpp
rename to kms++/src/modedb_dmt.cpp
index 6c74c5ec3896c38ff2c194852d2ae065fd43c2f3..e3f2ad5e60f1cd8f7baecfd6428bb476a3ec98ea 100644 (file)
--- a/kms++/modedb_dmt.cpp
+++ b/kms++/src/modedb_dmt.cpp
* DEALINGS IN THE SOFTWARE.
*/
-#include "modedb.h"
+#include <kms++/modedb.h>
#include <xf86drm.h>
similarity index 96%
rename from kms++/pixelformats.cpp
rename to kms++/src/pixelformats.cpp
index 594bd6d55c91034c7cbbaa98fee101066377826c..f2b1137db41a77222db1ceda53d231e5fbc84d19 100644 (file)
rename from kms++/pixelformats.cpp
rename to kms++/src/pixelformats.cpp
index 594bd6d55c91034c7cbbaa98fee101066377826c..f2b1137db41a77222db1ceda53d231e5fbc84d19 100644 (file)
--- a/kms++/pixelformats.cpp
#include <map>
-#include "pixelformats.h"
+#include <kms++/pixelformats.h>
using namespace std;
diff --git a/kms++/plane.cpp b/kms++/src/plane.cpp
similarity index 98%
rename from kms++/plane.cpp
rename to kms++/src/plane.cpp
index 46cd3e6fe2d50e2f356cdab02691e65687627fa3..10aaedaf66101a0659f53bc2f752783b62adfa7a 100644 (file)
rename from kms++/plane.cpp
rename to kms++/src/plane.cpp
index 46cd3e6fe2d50e2f356cdab02691e65687627fa3..10aaedaf66101a0659f53bc2f752783b62adfa7a 100644 (file)
--- a/kms++/plane.cpp
+++ b/kms++/src/plane.cpp
#include <xf86drm.h>
#include <xf86drmMode.h>
-#include "kms++.h"
+#include <kms++/kms++.h>
using namespace std;
diff --git a/kms++/property.cpp b/kms++/src/property.cpp
similarity index 98%
rename from kms++/property.cpp
rename to kms++/src/property.cpp
index e4390baaab0426e88354b92b63d52d80007f7913..ee799221ff9f3f165b094f65da44b8e88067f9f5 100644 (file)
rename from kms++/property.cpp
rename to kms++/src/property.cpp
index e4390baaab0426e88354b92b63d52d80007f7913..ee799221ff9f3f165b094f65da44b8e88067f9f5 100644 (file)
--- a/kms++/property.cpp
+++ b/kms++/src/property.cpp
#include <xf86drm.h>
#include <xf86drmMode.h>
-#include "kms++.h"
+#include <kms++/kms++.h>
using namespace std;
diff --git a/kms++/videomode.cpp b/kms++/src/videomode.cpp
similarity index 92%
rename from kms++/videomode.cpp
rename to kms++/src/videomode.cpp
index 5c98c006401b4767c1b1a674adb5b18b89605fd2..30d47f8d2ba82d07cfa1487a9a21de813f8871aa 100644 (file)
rename from kms++/videomode.cpp
rename to kms++/src/videomode.cpp
index 5c98c006401b4767c1b1a674adb5b18b89605fd2..30d47f8d2ba82d07cfa1487a9a21de813f8871aa 100644 (file)
--- a/kms++/videomode.cpp
+++ b/kms++/src/videomode.cpp
#include <xf86drm.h>
#include <xf86drmMode.h>
-#include "videomode.h"
+#include <kms++/kms++.h>
#include "helpers.h"
using namespace std;
diff --git a/kms++util/colorbar.cpp b/kms++util/colorbar.cpp
index 6a5dbc47199aeef8733d765adeb80f99a875c4a8..9e6e68dd1ae7f96f7c61ceb450e9bf940efc5483 100644 (file)
--- a/kms++util/colorbar.cpp
+++ b/kms++util/colorbar.cpp
#include <cstdint>
-#include <kms++.h>
+#include <kms++/kms++.h>
#include "kms++util.h"
namespace kms
index d2073bcaf248dc32c56eb02b2bc3df5068f570bf..14985288214a189b41e8d03234ad860f1a7cf661 100644 (file)
#pragma once
-#include "kms++.h"
+#include <kms++/kms++.h>
namespace kms
{
diff --git a/kms++util/drawing.cpp b/kms++util/drawing.cpp
index 9018817299fdc3fdd7cc28cd25a9ee05d8c69918..2ca567c1847041b2de8ed1fa10ec92cef608b402 100644 (file)
--- a/kms++util/drawing.cpp
+++ b/kms++util/drawing.cpp
-#include <kms++.h>
+#include <kms++/kms++.h>
#include <kms++util.h>
using namespace std;
index 172841fc6d02dcfb8e34042a1fcfb366590da434..5d3be7414ef8351f72ae0143ef6c84528ed47f40 100644 (file)
#pragma once
-#include "kms++.h"
+#include <kms++/kms++.h>
namespace kms
{
diff --git a/kms++util/kms++util.h b/kms++util/kms++util.h
index 6c835c86468fa3864c1091664086186d14f91f65..0c07d1824bc7b0204854c8ad75a99e381e0306fd 100644 (file)
--- a/kms++util/kms++util.h
+++ b/kms++util/kms++util.h
#pragma once
-#include <kms++.h>
+#include <kms++/kms++.h>
#include "color.h"
#include <cstdio>
diff --git a/kms++util/testpat.cpp b/kms++util/testpat.cpp
index b859180c23801155b7913aa76f639d3806089d2b..7a2e4d38199abf4b0c0e532c85599f91a6e75eca 100644 (file)
--- a/kms++util/testpat.cpp
+++ b/kms++util/testpat.cpp
#include <cassert>
#include <thread>
-#include <kms++.h>
+#include <kms++/kms++.h>
#include <kms++util.h>
#include <cpuframebuffer.h>
#include "stopwatch.h"
diff --git a/kmscube/cube-gbm.cpp b/kmscube/cube-gbm.cpp
index f6d312b5277718fa879e1cc71d500e2745574ab6..93ebece90a38cf34b28b8a6097a0a69dc7c354ca 100644 (file)
--- a/kmscube/cube-gbm.cpp
+++ b/kmscube/cube-gbm.cpp
#include <xf86drmMode.h>
#include <gbm.h>
-#include <kms++.h>
+#include <kms++/kms++.h>
#include <kms++util.h>
#include "cube-egl.h"
#include "cube-gles2.h"
diff --git a/py/pykms.cpp b/py/pykms.cpp
index deb827693506e803318b7c057dd0a2fb752a2f88..57ca363c5fc274c213790b63ace94ded2edd2114 100644 (file)
--- a/py/pykms.cpp
+++ b/py/pykms.cpp
#include <pybind11/pybind11.h>
#include <pybind11/stl.h>
-#include <kms++.h>
+#include <kms++/kms++.h>
namespace py = pybind11;
diff --git a/py/pykmsbase.cpp b/py/pykmsbase.cpp
index efc760aabb3d0e8538de95b20448fc2eae1e716b..3d1998e6723ef5372edc6f7cb327658f27be66ed 100644 (file)
--- a/py/pykmsbase.cpp
+++ b/py/pykmsbase.cpp
#include <pybind11/pybind11.h>
#include <pybind11/stl.h>
-#include <kms++.h>
+#include <kms++/kms++.h>
namespace py = pybind11;
diff --git a/py/pykmsutil.cpp b/py/pykmsutil.cpp
index 0d4cf89e2aeadbc318447c49e658ade757b1b499..f060bdf0936f5791f56bbfbaff850f307f21a36e 100644 (file)
--- a/py/pykmsutil.cpp
+++ b/py/pykmsutil.cpp
#include <pybind11/pybind11.h>
#include <pybind11/stl.h>
-#include <kms++.h>
+#include <kms++/kms++.h>
#include <kms++util.h>
namespace py = pybind11;
diff --git a/utils/kmsblank.cpp b/utils/kmsblank.cpp
index 8b883bb2d2bab9448ab3c283d6191f2579a4b4e5..864f2691c10ee0dedfa04b708c1c4930ad600fc6 100644 (file)
--- a/utils/kmsblank.cpp
+++ b/utils/kmsblank.cpp
#include <unistd.h>
#include <algorithm>
-#include <kms++.h>
+#include <kms++/kms++.h>
#include <kms++util.h>
#include "opts.h"
diff --git a/utils/kmscapture.cpp b/utils/kmscapture.cpp
index 7fc054ec95531a3981c231944ec3b0cf9e2b1116..dc65f1e6bb7f50f79da52061ed902f4a52f94725 100644 (file)
--- a/utils/kmscapture.cpp
+++ b/utils/kmscapture.cpp
#include <xf86drm.h>
#include <glob.h>
-#include <kms++.h>
+#include <kms++/kms++.h>
#include <kms++util.h>
#include <opts.h>
diff --git a/utils/kmsprint.cpp b/utils/kmsprint.cpp
index 3b17f5bde21725eb8a2cf029187ce3e8aae9d565..7c8e01f96382583f17d64be2c1748d38654a69b6 100644 (file)
--- a/utils/kmsprint.cpp
+++ b/utils/kmsprint.cpp
#include <unistd.h>
#include <inttypes.h>
-#include "kms++.h"
+#include <kms++/kms++.h>
#include "opts.h"
#include "kms++util.h"
#include "strhelpers.h"
diff --git a/utils/kmsview.cpp b/utils/kmsview.cpp
index b59e004bda4273f36d418e95a53a93f2186b3dea..8efcecd9d9f0436cba27e8a7fff38ad2a5a830fd 100644 (file)
--- a/utils/kmsview.cpp
+++ b/utils/kmsview.cpp
#include <fstream>
#include <unistd.h>
-#include <kms++.h>
+#include <kms++/kms++.h>
#include <kms++util.h>
#include <opts.h>
diff --git a/utils/testpat.cpp b/utils/testpat.cpp
index 094e22a87d521f86f9728f01406e4a6e70d0366d..4fe8d0bb31f40f8b3800aabb7904262bf21e352c 100644 (file)
--- a/utils/testpat.cpp
+++ b/utils/testpat.cpp
#include <set>
#include <chrono>
-#include <kms++.h>
-#include <modedb.h>
+#include <kms++/kms++.h>
+#include <kms++/modedb.h>
#include <kms++util.h>
#include <opts.h>