소스 검색

include dir was exported

Denis V. Dedkov 1 년 전
부모
커밋
45162202c8
6개의 변경된 파일8개의 추가작업 그리고 6개의 파일을 삭제
  1. 4 2
      CMakeLists.txt
  2. 0 0
      include/iusbdevice.h
  3. 1 1
      include/noolite.h
  4. 1 1
      src/libusbdevice.h
  5. 1 1
      tests/mocks/usbdevicemock.h
  6. 1 1
      tests/tst_adapter.cpp

+ 4 - 2
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)

+ 0 - 0
interfaces/iusbdevice.h → include/iusbdevice.h


+ 1 - 1
src/noolite.h → include/noolite.h

@@ -4,7 +4,7 @@
 #include <vector>
 #include <optional>
 
-#include "interfaces/iusbdevice.h"
+#include "iusbdevice.h"
 
 namespace noolitelib
 {

+ 1 - 1
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;

+ 1 - 1
tests/mocks/usbdevicemock.h

@@ -3,7 +3,7 @@
 
 #include <gmock/gmock.h>
 
-#include "interfaces/iusbdevice.h"
+#include "iusbdevice.h"
 
 class UsbDeviceMock : public noolitelib::IUsbDevice
 {

+ 1 - 1
tests/tst_adapter.cpp

@@ -2,7 +2,7 @@
 
 #include "mocks/usbdevicemock.h"
 
-#include "src/noolite.h"
+#include "noolite.h"
 
 using namespace testing;