Skip to content
Snippets Groups Projects
Commit 89cd938a authored by Stuart Mark James's avatar Stuart Mark James
Browse files

Catch2 -> submodule to track versions

parent caffd896
No related branches found
No related tags found
No related merge requests found
......@@ -4,3 +4,6 @@
[submodule "thirdparty/libpqxx"]
path = thirdparty/libpqxx
url = https://github.com/jtv/libpqxx.git
[submodule "thirdparty/Catch2"]
path = thirdparty/Catch2
url = https://github.com/catchorg/Catch2.git
......@@ -82,6 +82,7 @@ find_package(Threads REQUIRED)
add_subdirectory(thirdparty/libhdbpp EXCLUDE_FROM_ALL)
add_subdirectory(thirdparty/libpqxx EXCLUDE_FROM_ALL)
add_subdirectory(thirdparty/spdlog EXCLUDE_FROM_ALL)
add_subdirectory(thirdparty/Catch2 EXCLUDE_FROM_ALL)
set_target_properties(pqxx_shared
PROPERTIES
......@@ -137,7 +138,6 @@ set_target_properties(libhdbpp_timescale_shared_library
VERSION ${VERSION_STRING}
SOVERSION ${VERSION_STRING})
target_compile_definitions(libhdbpp_timescale_shared_library PRIVATE -DDEBUG_ENABLED)
target_compile_options(libhdbpp_timescale_shared_library PRIVATE "$<$<CONFIG:DEBUG>:-g>")
#target_compile_features(libhdbpp_timescale_shared_library PRIVATE cxx_std_17)
......@@ -155,7 +155,6 @@ set_target_properties(libhdbpp_timescale_static_library
CXX_STANDARD 14
EXCLUDE_FROM_ALL 1)
target_compile_definitions(libhdbpp_timescale_static_library PRIVATE -DDEBUG_ENABLED)
target_compile_options(libhdbpp_timescale_static_library PRIVATE "$<$<CONFIG:DEBUG>:-g>")
#target_compile_features(libhdbpp_timescale_shared_library PRIVATE cxx_std_17)
......
......@@ -4,9 +4,9 @@ set(CMAKE_VERBOSE_MAKEFILE ON)
set(CMAKE_COLOR_MAKEFILE ON)
# Prepare "Catch" library for other executables
set(CATCH_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/catch2)
add_library(catch_library INTERFACE)
target_include_directories(catch_library INTERFACE ${CATCH_INCLUDE_DIR})
#set(CATCH_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/catch2)
#add_library(catch_library INTERFACE)
#target_include_directories(catch_library INTERFACE ${CATCH_INCLUDE_DIR})
# Make test executable
set(TEST_SOURCES
......@@ -28,7 +28,7 @@ add_executable(unit-tests ${TEST_SOURCES})
target_compile_options(unit-tests PRIVATE -Wall -Wextra -g)
target_link_libraries(unit-tests
PRIVATE catch_library libhdbpp_headers libhdbpp_timescale_shared_library TangoInterfaceLibrary)
PRIVATE libhdbpp_headers libhdbpp_timescale_shared_library Catch2 TangoInterfaceLibrary)
target_include_directories(unit-tests PRIVATE ${UNIT_TEST_INCLUDE_PATHS})
target_compile_definitions(unit-tests PRIVATE -DDEBUG_ENABLED)
......
This diff is collapsed.
Subproject commit 2f631bb8087a0355d2b23a75a28d936ce237659d
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment