WIP: fix CMakeLists and includes

CMakeLists.txt

@@ -51,7 +51,7 @@ ENDIF()
 ###########################################
 message(STATUS "Build directory ${CMAKE_BINARY_DIR}")
 include(${CMAKE_BINARY_DIR}/conanbuildinfo.cmake)
-conan_basic_setup(KEEP_RPATHS)
+conan_basic_setup()
 
 # fix grpc - remove unsecure (no-op ssl implementations)
 string(REGEX REPLACE "grpc\\+?\\+?_unsecure" "" CONAN_LIBS_GRPC
@@ -147,15 +147,11 @@ add_custom_command(
 ###############################################################################
 
 if("${CMAKE_BUILD_TYPE}" MATCHES "Debug")
-    add_library(caosdb_grpc SHARED ${GRPC_GENERATED})
-    add_library(caosdb SHARED ${libcaosdb_INCL} ${libcaosdb_SRC})
+  add_library(caosdb_grpc SHARED ${GRPC_GENERATED})
+  add_library(caosdb SHARED ${libcaosdb_INCL} ${libcaosdb_SRC})
     target_link_libraries(caosdb caosdb_grpc)
-    target_link_libraries(caosdb_grpc ${CONAN_LIBS})
     set(LIBCAOSDB caosdb caosdb_grpc)
 
-    target_include_directories(caosdb_grpc SYSTEM PUBLIC
-        ${CONAN_INCLUDE_DIRS}
-    )
     target_include_directories(caosdb_grpc PUBLIC
         $<BUILD_INTERFACE:${libcaosdb_SOURCE_DIR}/include>
         $<BUILD_INTERFACE:${libcaosdb_BINARY_DIR}/include>
@@ -173,9 +169,6 @@ endif()
 target_link_libraries(caosdb
     ${CONAN_LIBS}
 )
-target_include_directories(caosdb SYSTEM PUBLIC
-    ${CONAN_INCLUDE_DIRS}
-)
 target_include_directories(caosdb PUBLIC
     $<BUILD_INTERFACE:${libcaosdb_SOURCE_DIR}/include>
     $<BUILD_INTERFACE:${libcaosdb_BINARY_DIR}/include>
@@ -201,9 +194,6 @@ target_include_directories(ccaosdb SYSTEM PUBLIC
 
 
 add_executable(ccaosdbcli EXCLUDE_FROM_ALL src/ccaosdbcli.c)
-target_include_directories(ccaosdbcli SYSTEM PUBLIC
-    ${CONAN_INCLUDE_DIRS}
-)
 target_include_directories(ccaosdbcli PUBLIC
     $<BUILD_INTERFACE:${libcaosdb_SOURCE_DIR}/include>
     $<BUILD_INTERFACE:${libcaosdb_BINARY_DIR}/include>
@@ -220,9 +210,6 @@ target_link_libraries(ccaosdbcli
 )
 
 add_executable(cxxcaosdbcli EXCLUDE_FROM_ALL src/cxxcaosdbcli.cpp)
-target_include_directories(cxxcaosdbcli SYSTEM PUBLIC
-    ${CONAN_INCLUDE_DIRS}
-)
 target_include_directories(cxxcaosdbcli PUBLIC
     $<BUILD_INTERFACE:${libcaosdb_SOURCE_DIR}/include>
     $<BUILD_INTERFACE:${libcaosdb_BINARY_DIR}/include>
@@ -237,6 +224,7 @@ target_link_libraries(cxxcaosdbcli
 )
 
 
+
 #######################################################
 ### LINTING with CLANG-TIDY and INCLUDE-WHAT-YOU-USE
 #######################################################
@@ -275,15 +263,15 @@ endfunction()
 
 
 option(LINTING "Enable linting with clang-tidy and iwyu when in non-Debug build-type" OFF)
-if (clang_tidy AND ("${CMAKE_BUILD_TYPE}" MATCHES "Debug" OR LINTING))
+if("${CMAKE_BUILD_TYPE}" MATCHES "Debug" OR LINTING)
     set(_LINTING ON)
 endif()
 option(SKIP_LINTING "Skip linting even when in Debug build-type" OFF)
-if ("${CMAKE_BUILD_TYPE}" MATCHES "Debug" AND SKIP_LINTING)
+if("${CMAKE_BUILD_TYPE}" MATCHES "Debug" AND SKIP_LINTING)
     message(WARNING "Skipping linting due to SKIP_LINTING option")
     set(_LINTING OFF)
 endif()
-if (_LINTING)
+if(_LINTING)
 
     ### set paranoid compiler flags
     add_compiler_flag("-Wall")

src/caosdb/logging.cpp

@@ -20,13 +20,11 @@
  */
 #include "caosdb/logging.h"
 #include "caosdb/log_level.h"
-#include "caosdb/protobuf_helper.h"
 #include <boost/core/swap.hpp> // for swap
 #include <boost/iterator/iterator_facade.hpp>
 #include <boost/log/attributes/clock.hpp>
 #include <boost/log/core/core.hpp> // for core
 #include <boost/log/core/record.hpp>
-#include <boost/log/sources/global_logger_storage.hpp>
 #include <boost/log/sources/record_ostream.hpp>
 #include <boost/log/sources/severity_channel_logger.hpp>
 #include <boost/log/utility/setup/from_settings.hpp>
@@ -39,7 +37,6 @@
 #include <boost/property_tree/detail/exception_implementation.hpp>
 #include <boost/smart_ptr/shared_ptr.hpp>
 #include <boost/tuple/detail/tuple_basic.hpp> // for get
-#include <iostream>
 #include <memory>
 #include <sstream>
 #include <string>