Skip to content
Snippets Groups Projects
Verified Commit d3f36157 authored by Timm Fitschen's avatar Timm Fitschen
Browse files

WIP: fix CMakeLists and includes

parent de5b6541
No related branches found
No related tags found
2 merge requests!33Release 0.1,!30Debug build
Pipeline #16175 passed with warnings
Pipeline: caosdb-cppinttest

#16177

    This commit is part of merge request !33. Comments created here will be created in the context of that merge request.
    ...@@ -51,7 +51,7 @@ ENDIF() ...@@ -51,7 +51,7 @@ ENDIF()
    ########################################### ###########################################
    message(STATUS "Build directory ${CMAKE_BINARY_DIR}") message(STATUS "Build directory ${CMAKE_BINARY_DIR}")
    include(${CMAKE_BINARY_DIR}/conanbuildinfo.cmake) include(${CMAKE_BINARY_DIR}/conanbuildinfo.cmake)
    conan_basic_setup(KEEP_RPATHS) conan_basic_setup()
    # fix grpc - remove unsecure (no-op ssl implementations) # fix grpc - remove unsecure (no-op ssl implementations)
    string(REGEX REPLACE "grpc\\+?\\+?_unsecure" "" CONAN_LIBS_GRPC string(REGEX REPLACE "grpc\\+?\\+?_unsecure" "" CONAN_LIBS_GRPC
    ...@@ -150,12 +150,8 @@ if("${CMAKE_BUILD_TYPE}" MATCHES "Debug") ...@@ -150,12 +150,8 @@ if("${CMAKE_BUILD_TYPE}" MATCHES "Debug")
    add_library(caosdb_grpc SHARED ${GRPC_GENERATED}) add_library(caosdb_grpc SHARED ${GRPC_GENERATED})
    add_library(caosdb SHARED ${libcaosdb_INCL} ${libcaosdb_SRC}) add_library(caosdb SHARED ${libcaosdb_INCL} ${libcaosdb_SRC})
    target_link_libraries(caosdb caosdb_grpc) target_link_libraries(caosdb caosdb_grpc)
    target_link_libraries(caosdb_grpc ${CONAN_LIBS})
    set(LIBCAOSDB caosdb caosdb_grpc) set(LIBCAOSDB caosdb caosdb_grpc)
    target_include_directories(caosdb_grpc SYSTEM PUBLIC
    ${CONAN_INCLUDE_DIRS}
    )
    target_include_directories(caosdb_grpc PUBLIC target_include_directories(caosdb_grpc PUBLIC
    $<BUILD_INTERFACE:${libcaosdb_SOURCE_DIR}/include> $<BUILD_INTERFACE:${libcaosdb_SOURCE_DIR}/include>
    $<BUILD_INTERFACE:${libcaosdb_BINARY_DIR}/include> $<BUILD_INTERFACE:${libcaosdb_BINARY_DIR}/include>
    ...@@ -173,9 +169,6 @@ endif() ...@@ -173,9 +169,6 @@ endif()
    target_link_libraries(caosdb target_link_libraries(caosdb
    ${CONAN_LIBS} ${CONAN_LIBS}
    ) )
    target_include_directories(caosdb SYSTEM PUBLIC
    ${CONAN_INCLUDE_DIRS}
    )
    target_include_directories(caosdb PUBLIC target_include_directories(caosdb PUBLIC
    $<BUILD_INTERFACE:${libcaosdb_SOURCE_DIR}/include> $<BUILD_INTERFACE:${libcaosdb_SOURCE_DIR}/include>
    $<BUILD_INTERFACE:${libcaosdb_BINARY_DIR}/include> $<BUILD_INTERFACE:${libcaosdb_BINARY_DIR}/include>
    ...@@ -201,9 +194,6 @@ target_include_directories(ccaosdb SYSTEM PUBLIC ...@@ -201,9 +194,6 @@ target_include_directories(ccaosdb SYSTEM PUBLIC
    add_executable(ccaosdbcli EXCLUDE_FROM_ALL src/ccaosdbcli.c) add_executable(ccaosdbcli EXCLUDE_FROM_ALL src/ccaosdbcli.c)
    target_include_directories(ccaosdbcli SYSTEM PUBLIC
    ${CONAN_INCLUDE_DIRS}
    )
    target_include_directories(ccaosdbcli PUBLIC target_include_directories(ccaosdbcli PUBLIC
    $<BUILD_INTERFACE:${libcaosdb_SOURCE_DIR}/include> $<BUILD_INTERFACE:${libcaosdb_SOURCE_DIR}/include>
    $<BUILD_INTERFACE:${libcaosdb_BINARY_DIR}/include> $<BUILD_INTERFACE:${libcaosdb_BINARY_DIR}/include>
    ...@@ -220,9 +210,6 @@ target_link_libraries(ccaosdbcli ...@@ -220,9 +210,6 @@ target_link_libraries(ccaosdbcli
    ) )
    add_executable(cxxcaosdbcli EXCLUDE_FROM_ALL src/cxxcaosdbcli.cpp) add_executable(cxxcaosdbcli EXCLUDE_FROM_ALL src/cxxcaosdbcli.cpp)
    target_include_directories(cxxcaosdbcli SYSTEM PUBLIC
    ${CONAN_INCLUDE_DIRS}
    )
    target_include_directories(cxxcaosdbcli PUBLIC target_include_directories(cxxcaosdbcli PUBLIC
    $<BUILD_INTERFACE:${libcaosdb_SOURCE_DIR}/include> $<BUILD_INTERFACE:${libcaosdb_SOURCE_DIR}/include>
    $<BUILD_INTERFACE:${libcaosdb_BINARY_DIR}/include> $<BUILD_INTERFACE:${libcaosdb_BINARY_DIR}/include>
    ...@@ -237,6 +224,7 @@ target_link_libraries(cxxcaosdbcli ...@@ -237,6 +224,7 @@ target_link_libraries(cxxcaosdbcli
    ) )
    ####################################################### #######################################################
    ### LINTING with CLANG-TIDY and INCLUDE-WHAT-YOU-USE ### LINTING with CLANG-TIDY and INCLUDE-WHAT-YOU-USE
    ####################################################### #######################################################
    ...@@ -275,7 +263,7 @@ endfunction() ...@@ -275,7 +263,7 @@ endfunction()
    option(LINTING "Enable linting with clang-tidy and iwyu when in non-Debug build-type" OFF) 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) set(_LINTING ON)
    endif() endif()
    option(SKIP_LINTING "Skip linting even when in Debug build-type" OFF) option(SKIP_LINTING "Skip linting even when in Debug build-type" OFF)
    ......
    ...@@ -20,13 +20,11 @@ ...@@ -20,13 +20,11 @@
    */ */
    #include "caosdb/logging.h" #include "caosdb/logging.h"
    #include "caosdb/log_level.h" #include "caosdb/log_level.h"
    #include "caosdb/protobuf_helper.h"
    #include <boost/core/swap.hpp> // for swap #include <boost/core/swap.hpp> // for swap
    #include <boost/iterator/iterator_facade.hpp> #include <boost/iterator/iterator_facade.hpp>
    #include <boost/log/attributes/clock.hpp> #include <boost/log/attributes/clock.hpp>
    #include <boost/log/core/core.hpp> // for core #include <boost/log/core/core.hpp> // for core
    #include <boost/log/core/record.hpp> #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/record_ostream.hpp>
    #include <boost/log/sources/severity_channel_logger.hpp> #include <boost/log/sources/severity_channel_logger.hpp>
    #include <boost/log/utility/setup/from_settings.hpp> #include <boost/log/utility/setup/from_settings.hpp>
    ...@@ -39,7 +37,6 @@ ...@@ -39,7 +37,6 @@
    #include <boost/property_tree/detail/exception_implementation.hpp> #include <boost/property_tree/detail/exception_implementation.hpp>
    #include <boost/smart_ptr/shared_ptr.hpp> #include <boost/smart_ptr/shared_ptr.hpp>
    #include <boost/tuple/detail/tuple_basic.hpp> // for get #include <boost/tuple/detail/tuple_basic.hpp> // for get
    #include <iostream>
    #include <memory> #include <memory>
    #include <sstream> #include <sstream>
    #include <string> #include <string>
    ......
    0% Loading or .
    You are about to add 0 people to the discussion. Proceed with caution.
    Please register or to comment