diff --git a/CMakeLists.txt b/CMakeLists.txt index 2fad804..2e3c790 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -7,8 +7,8 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON) set(CMAKE_INCLUDE_CURRENT_DIR ON) add_library(noolite STATIC - interfaces/iusbdevice.h - src/noolite.h src/noolite.cpp + include/iusbdevice.h + include/noolite.h src/noolite.cpp src/libusbdevice.h src/libusbdevice.cpp ) @@ -19,3 +19,5 @@ target_link_libraries(noolite PUBLIC ${LIBUSB_LIBRARY}) target_compile_definitions(noolite PRIVATE NOOLITE_LIBRARY) add_subdirectory(tests) + +target_include_directories(noolite PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/include) diff --git a/interfaces/iusbdevice.h b/include/iusbdevice.h similarity index 100% rename from interfaces/iusbdevice.h rename to include/iusbdevice.h diff --git a/src/noolite.h b/include/noolite.h similarity index 95% rename from src/noolite.h rename to include/noolite.h index 6a517fa..dc5d3a3 100644 --- a/src/noolite.h +++ b/include/noolite.h @@ -4,7 +4,7 @@ #include #include -#include "interfaces/iusbdevice.h" +#include "iusbdevice.h" namespace noolitelib { diff --git a/src/libusbdevice.h b/src/libusbdevice.h index f02eed0..bc9bbe3 100644 --- a/src/libusbdevice.h +++ b/src/libusbdevice.h @@ -1,7 +1,7 @@ #ifndef LIBUSBDEVICE_H #define LIBUSBDEVICE_H -#include "interfaces/iusbdevice.h" +#include "iusbdevice.h" struct libusb_context; struct libusb_device_handle; diff --git a/tests/mocks/usbdevicemock.h b/tests/mocks/usbdevicemock.h index da6e13d..8187717 100644 --- a/tests/mocks/usbdevicemock.h +++ b/tests/mocks/usbdevicemock.h @@ -3,7 +3,7 @@ #include -#include "interfaces/iusbdevice.h" +#include "iusbdevice.h" class UsbDeviceMock : public noolitelib::IUsbDevice { diff --git a/tests/tst_adapter.cpp b/tests/tst_adapter.cpp index 89fe8e1..763d798 100644 --- a/tests/tst_adapter.cpp +++ b/tests/tst_adapter.cpp @@ -2,7 +2,7 @@ #include "mocks/usbdevicemock.h" -#include "src/noolite.h" +#include "noolite.h" using namespace testing;