Commit 7a90b9cf authored by Thomas Braun's avatar Thomas Braun
Browse files

log4tango/include: Include headers in the common tango hierarchy 

We want to get rid of the toplevel log4tango directory as outlined in [1].

[1]: #958
parent eac507fb

log4tango/CMakeLists.txt

+2 −8
Original line number Diff line number Diff line
@@ -4,7 +4,6 @@ 


include(${CMAKE_CURRENT_SOURCE_DIR}/config/config.cmake)



add_subdirectory(include/tango/common/log4tango)

add_subdirectory(src)



add_library(log4tango_objects OBJECT ${SOURCES})
@@ -13,8 +12,8 @@ set(LOG4TANGO_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}) 
set(LOG4TANGO_BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR})



target_include_directories(log4tango_objects PRIVATE

    ${LOG4TANGO_SOURCE_DIR}/include

    ${LOG4TANGO_BINARY_DIR}/include

    ${LOG4TANGO_SOURCE_DIR}/../src/include

    ${LOG4TANGO_BINARY_DIR}/../src/include

)



if(WIN32)
@@ -22,8 +21,3 @@ if(WIN32) 
else()

    target_compile_options(log4tango_objects PRIVATE -fPIC)

endif()
 


if (TANGO_CHECK_HEADERS_SELF_CONTAINED)

    file(GLOB_RECURSE _all_headers LIST_DIRECTORIES FALSE RELATIVE "${LOG4TANGO_SOURCE_DIR}/include" CONFIGURE_DEPENDS "*.h")

    tango_add_check_headers_self_contained(PREFIX log4tango INCLUDE_PATHS ${_all_headers})

endif()

log4tango/config/config.cmake

+1 −1
Original line number Diff line number Diff line
@@ -18,4 +18,4 @@ if(NOT DEFINED Threads_FOUND) 
  message(FATAL_ERROR "Could not find a suitable threading library")

endif()



configure_file(config/config.h.in ${PROJECT_BINARY_DIR}/log4tango/include/tango/common/log4tango/config.h)
 
configure_file(config/config.h.in ${PROJECT_BINARY_DIR}/src/include/tango/common/log4tango/config.h)

log4tango/src/Logger.cpp

+1 −1
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ 
  #include <unistd.h>

#endif



#include <tango/internal/StringUtil.h>

#include <tango/internal/log4tango/StringUtil.h>



#include <tango/common/log4tango/Logger.h>

log4tango/src/StringUtil.cpp

+1 −1
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ 
 * SPDX-License-Identifier: LGPL-3.0-or-later

 */



#include <tango/internal/StringUtil.h>

#include <tango/internal/log4tango/StringUtil.h>



#include <cstdio>

#include <iterator>

src/doxygen/Doxyfile.in

+0 −1
Original line number Diff line number Diff line
@@ -815,7 +815,6 @@ WARN_LOGFILE = 


INPUT                  = @PROJECT_SOURCE_DIR@/src/include                              \

                         @PROJECT_SOURCE_DIR@/src/client/doc.h                         \

                         @PROJECT_SOURCE_DIR@/log4tango/include                        \

                         @PROJECT_BINARY_DIR@/src/include/tango/idl                    \

                         @PROJECT_BINARY_DIR@/src/include/tango/common/tango_version.h \

                         @omniORB4_INCLUDE_DIR@/omnithread                             \