Explorar el Código

Conan support (#156); Catch2 dependency added.

main
offa hace 5 años
padre
commit
199e604a53
Se han modificado 3 ficheros con 11 adiciones y 4 borrados
  1. +3
    -0
      CMakeLists.txt
  2. +6
    -0
      conanfile.txt
  3. +2
    -4
      test/CMakeLists.txt

+ 3
- 0
CMakeLists.txt Ver fichero

@@ -31,6 +31,9 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON)
set(CMAKE_CXX_EXTENSIONS OFF)


include("${CMAKE_BINARY_DIR}/conan_paths.cmake" OPTIONAL)


add_library(ScopeGuard INTERFACE)
target_include_directories(ScopeGuard INTERFACE
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>

+ 6
- 0
conanfile.txt Ver fichero

@@ -0,0 +1,6 @@
[requires]
Catch2/2.8.0@catchorg/stable

[generators]
cmake_find_package
cmake_paths

+ 2
- 4
test/CMakeLists.txt Ver fichero

@@ -1,13 +1,11 @@

add_library(Catch INTERFACE)
target_include_directories(Catch INTERFACE "catch")
find_package(Catch2 REQUIRED)

add_library(Trompeloeil INTERFACE)
target_include_directories(Trompeloeil INTERFACE "trompeloeil")


add_library(TestMain TestMain.cpp)
target_link_libraries(TestMain PUBLIC Catch Trompeloeil)
target_link_libraries(TestMain PUBLIC Catch2::Catch2 Trompeloeil)


function(add_test_suite name)

Cargando…
Cancelar
Guardar