Improved cmake setup

2024-11-17 13:47:51 +01:00 · 2020-10-04 19:02:39 +02:00 · 2020-10-04 19:02:39 +02:00 · 348aa81607
commit 348aa81607
parent ba5cb5d6c5
3 changed files with 9 additions and 6 deletions
--- a/.travis.yml
+++ b/.travis.yml
@ -28,5 +28,5 @@ script:
  - mkdir tmp
  - cd tmp
  - cmake ..
-  - make
+  - make -j4
  - ../build/MaddyTests
--- 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)
--- a/2
+++ b/2
@ -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