diff --git a/.travis.yml b/.travis.yml index b6bbb76..4daaa67 100644 --- a/.travis.yml +++ b/.travis.yml @@ -28,5 +28,5 @@ script: - mkdir tmp - cd tmp - cmake .. - - make + - make -j4 - ../build/MaddyTests diff --git a/CMakeLists.txt b/CMakeLists.txt index 70f723f..ec6649f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -60,10 +60,9 @@ add_subdirectory(libs) # ------------------------------------------------------------------------------ -include_directories( - ${LIBS_INCLUDE_DIRS} +add_library(maddy INTERFACE) +target_include_directories(maddy INTERFACE ${MADDY_INCLUDE_DIR} - ${CMAKE_CURRENT_SOURCE_DIR}/tests ) # ------------------------------------------------------------------------------ @@ -73,5 +72,9 @@ add_executable( ${MADDY_TESTS_FILES} ${CMAKE_CURRENT_SOURCE_DIR}/tests/main.cpp ) -target_link_libraries(MaddyTests gmock_main) +target_include_directories(MaddyTests PUBLIC + ${LIBS_INCLUDE_DIRS} + ${CMAKE_CURRENT_SOURCE_DIR}/tests +) +target_link_libraries(MaddyTests maddy gmock_main) add_test(MaddyTests ${CMAKE_CURRENT_SOURCE_DIR}/build/MaddyTests) diff --git a/LICENSE b/LICENSE index 2333dfd..3879e0d 100644 --- a/LICENSE +++ b/LICENSE @@ -1,4 +1,4 @@ -Copyright 2017, 2018, 2019 M. Petra Baranski +Copyright 2017, 2018, 2019, 2020 M. Petra Baranski Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in