Improved cmake setup

このコミットが含まれているのは:
Petra Baranski 2020-10-04 19:02:39 +02:00
コミット 348aa81607
3個のファイルの変更9行の追加6行の削除

ファイルの表示

@ -28,5 +28,5 @@ script:
- mkdir tmp
- cd tmp
- cmake ..
- make
- make -j4
- ../build/MaddyTests

ファイルの表示

@ -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)

ファイルの表示

@ -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