Skip to content

Commit

Permalink
Trying to get the conan build working
Browse files Browse the repository at this point in the history
  • Loading branch information
jgaa committed Mar 9, 2024
1 parent 39f81e3 commit bd1c813
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 0 deletions.
7 changes: 7 additions & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,13 @@ include(GNUInstallDirs)

set(LOGFAULT_ROOT ${CMAKE_CURRENT_SOURCE_DIR})

message(STATUS "Using ${CMAKE_CXX_COMPILER}")

macro(SET_CPP_STANDARD target)
message(STATUS "Using C++ 11 for ${target}")
set_property(TARGET ${target} PROPERTY CXX_STANDARD 11)
endmacro(SET_CPP_STANDARD)

find_package (Threads)
set(DEFAULT_LIBRARIES ${CMAKE_THREAD_LIBS_INIT})
include_directories(
Expand Down
5 changes: 5 additions & 0 deletions tests/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,9 @@ option(WITH_QT "Enable QT" OFF)

####### default_to_clog

message ("GTEST_INCLUDE_DIRS: ${GTEST_INCLUDE_DIRS}")
message ("GTest_INCLUDE_DIRS: ${GTest_INCLUDE_DIRS}")

add_executable(default_to_clog
default_to_clog.cpp
)
Expand All @@ -31,6 +34,7 @@ target_include_directories(default_to_clog
${CMAKE_CURRENT_SOURCE_DIR}
${LOGFAULT_ROOT}/include
${GTEST_INCLUDE_DIRS}
${CMAKE_BINARY_DIR}/exports
)

target_link_libraries(default_to_clog
Expand All @@ -55,6 +59,7 @@ target_include_directories(default_to_clog_with_tid
${CMAKE_CURRENT_SOURCE_DIR}
${LOGFAULT_ROOT}/include
${GTEST_INCLUDE_DIRS}
${CMAKE_BINARY_DIR}/exports
)

target_link_libraries(default_to_clog_with_tid
Expand Down

0 comments on commit bd1c813

Please sign in to comment.