diff --git a/.gitignore b/.gitignore index c02820e..56c20dd 100644 --- a/.gitignore +++ b/.gitignore @@ -5,6 +5,6 @@ cmake/ versioning/ config/ global/ - +logutils/ .gitmodules diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 69c11f8..6a654ed 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -13,10 +13,9 @@ include_directories( SYSTEM include(compiler) include_directories( - ${CMAKE_CURRENT_SOURCE_DIR}/../logutils - ${CMAKE_CURRENT_SOURCE_DIR}/../config - ${CMAKE_CURRENT_SOURCE_DIR}/../dcxml - ${CMAKE_CURRENT_SOURCE_DIR}/../global + ${CMAKE_CURRENT_SOURCE_DIR}/../logutils/src/ + ${CMAKE_CURRENT_SOURCE_DIR}/../config/src/ + ${CMAKE_CURRENT_SOURCE_DIR}/../global/src/ ) set(SRC_LIST @@ -43,9 +42,6 @@ link_directories( include(library) add_libraries( ${Qt5Core_LIBRARIES} - logutils - global - config ) include(installation)