Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON)
add_library(${PROJECT_NAME} INTERFACE)

target_include_directories(${PROJECT_NAME} INTERFACE ${${PROJECT_NAME}_SOURCE_DIR})

enable_testing()
add_subdirectory(samples)
add_subdirectory(tests)

add_subdirectory(samples)

install(TARGETS circularbuffer DESTINATION lib)
41 changes: 34 additions & 7 deletions tests/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,14 +1,41 @@
cmake_minimum_required(VERSION 3.13)

message(STATUS "cmake in tests, project name ${PROJECT_NAME}" )

set(CMAKE_CXX_STANDARD 11)
set(CMAKE_CXX_STANDARD_REQUIRED ON)

add_executable(test_circularbuffer_int test_circularbuffer_int.cpp)
target_link_libraries(test_circularbuffer_int
PRIVATE
message(STATUS "cmake in tests, project name ${PROJECT_NAME}" )

configure_file(CMakeLists.txt.in googletest-download/CMakeLists.txt)
execute_process(COMMAND ${CMAKE_COMMAND} -G "${CMAKE_GENERATOR}" .
RESULT_VARIABLE result
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/googletest-download
)
if(result)
message(FATAL_ERROR "CMake step for googletest failed: ${result}")
endif()

execute_process(COMMAND ${CMAKE_COMMAND} --build .
RESULT_VARIABLE result
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/googletest-download
)

if(result)
message(FATAL_ERROR "Build step for googletest failed: ${result}")
endif()

# Prevent overriding the parent project's compiler/linker
# settings on Windows
set(gtest_force_shared_crt ON CACHE BOOL "" FORCE)

# Add googletest directly to our build. This defines
# the gtest and gtest_main targets.
add_subdirectory(${CMAKE_CURRENT_BINARY_DIR}/googletest-src
${CMAKE_CURRENT_BINARY_DIR}/googletest-build
EXCLUDE_FROM_ALL)

add_executable(circularbuffer_int circularbuffer_int.cpp)
target_link_libraries(circularbuffer_int
circularbuffer
/usr/local/lib/libgtest.a
pthread
gtest_main
)
add_test(NAME test_circularbuffer_int COMMAND circularbuffer_int)
15 changes: 15 additions & 0 deletions tests/CMakeLists.txt.in
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
cmake_minimum_required(VERSION 3.13)

project(googletest-download NONE)

include(ExternalProject)
ExternalProject_Add(googletest
GIT_REPOSITORY https://github.com/google/googletest.git
GIT_TAG master
SOURCE_DIR "${CMAKE_CURRENT_BINARY_DIR}/googletest-src"
BINARY_DIR "${CMAKE_CURRENT_BINARY_DIR}/googletest-build"
CONFIGURE_COMMAND ""
BUILD_COMMAND ""
INSTALL_COMMAND ""
TEST_COMMAND ""
)
Original file line number Diff line number Diff line change
Expand Up @@ -90,9 +90,4 @@ TEST_F(CircularBufferTest, PushAndPopTest){
}


int main(int argc, char *argv[])
{

::testing::InitGoogleTest(&argc, argv);
return RUN_ALL_TESTS();
}