open_source / qt-bluetooth

Commit dff35490af815f7ab6b873ac5af7c6e672f57fe2

Authored by Peter M. Groen
1 parent 4f0127a7

Added logger library

Inline Side-by-side
Showing 2 changed files with 4 additions and 2 deletions
CMakeLists.txt
  View file @dff3549
@@ -6,6 +6,7 @@ project(osdev_qt-bluetooth) @@ -6,6 +6,7 @@ project(osdev_qt-bluetooth)
6 include(projectheader) 6 include(projectheader)
7 project_header(osdev_qt-bluetooth) 7 project_header(osdev_qt-bluetooth)
8 8
  9 +add_subdirectory(submodules/logger)
9 add_subdirectory(src) 10 add_subdirectory(src)
10 add_subdirectory(tests) 11 add_subdirectory(tests)
11 12
src/CMakeLists.txt
  View file @dff3549
1 cmake_minimum_required(VERSION 3.0) 1 cmake_minimum_required(VERSION 3.0)
2 -LIST(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/../../../cmake) 2 +LIST(APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/submodules/cmake)
3 include(projectheader) 3 include(projectheader)
4 project_header(bluetooth) 4 project_header(bluetooth)
5 5
@@ -14,7 +14,7 @@ include_directories( SYSTEM @@ -14,7 +14,7 @@ include_directories( SYSTEM
14 include(compiler) 14 include(compiler)
15 15
16 include_directories( 16 include_directories(
17 - ${CMAKE_CURRENT_SOURCE_DIR}/../submodules/logutils/src 17 + ${CMAKEi_SOURCE_DIR}/submodules/logger/src
18 ) 18 )
19 19
20 set(SRC_LIST 20 set(SRC_LIST
@@ -42,6 +42,7 @@ include(library) @@ -42,6 +42,7 @@ include(library)
42 add_libraries( 42 add_libraries(
43 ${Qt5Core_LIBRARIES} 43 ${Qt5Core_LIBRARIES}
44 ${Qt5Bluetooth_LIBRARIES} 44 ${Qt5Bluetooth_LIBRARIES}
  45 + logger
45 ) 46 )
46 47
47 include(installation) 48 include(installation)