Fix build.

diff --git a/teshsuite/s4u/CMakeLists.txt b/teshsuite/s4u/CMakeLists.txt
index 886e7ee..6162ecb 100644 (file)
--- a/teshsuite/s4u/CMakeLists.txt
+++ b/teshsuite/s4u/CMakeLists.txt
@@ -11,10 +11,12 @@ foreach(x actor actor-autorestart
   set(teshsuite_src ${teshsuite_src} ${CMAKE_CURRENT_SOURCE_DIR}/${x}/${x}.cpp)
 endforeach()
 
+# Fix build rules for activity-lifecycle (multi-file)
 foreach(x sleep exec comm test-wait)
   target_sources(activity-lifecycle PRIVATE activity-lifecycle/testing_${x}.cpp)
   set(teshsuite_src ${teshsuite_src} ${CMAKE_CURRENT_SOURCE_DIR}/activity-lifecycle/testing_${x}.cpp)
 endforeach()
+set_property(TARGET activity-lifecycle APPEND PROPERTY INCLUDE_DIRECTORIES "${INTERNAL_INCLUDES}") # for <catch.hpp>
 
 ## Add the tests.
 ## Some need to be run with all factories, some don't need tesh to run

diff --git a/teshsuite/s4u/activity-lifecycle/activity-lifecycle.hpp b/teshsuite/s4u/activity-lifecycle/activity-lifecycle.hpp
index 22f3f40..c41c8fa 100644 (file)
--- a/teshsuite/s4u/activity-lifecycle/activity-lifecycle.hpp
+++ b/teshsuite/s4u/activity-lifecycle/activity-lifecycle.hpp
@@ -6,7 +6,7 @@
 #ifndef ACTIVITY_LIFECYCLE_HPP
 #define ACTIVITY_LIFECYCLE_HPP
 
-#include "../../src/include/catch.hpp"
+#include <catch.hpp>
 
 #include <simgrid/s4u.hpp>
 #include <xbt/log.h>