Now it builds.

diff --git a/src/mc/snapshot/unitTest/PageStore_unit_BOOST.cpp b/src/mc/snapshot/unitTest/PageStore_unit_BOOST.cpp
index ab92c0d..a1ec5cc 100644 (file)
--- a/src/mc/snapshot/unitTest/PageStore_unit_BOOST.cpp
+++ b/src/mc/snapshot/unitTest/PageStore_unit_BOOST.cpp
@@ -26,7 +26,7 @@ TODO: comment
 
 #include <memory>
 
 
 #include <memory>
 

-#include "/home/onesphore/simgrid/src/mc/PageStore.hpp"
+#include "src/mc/PageStore.hpp"

 
 static int value = 0;
 
 
 static int value = 0;
 

diff --git a/src/mc/snapshot/unitTest/mc_snapshot_unit_BOOST.cpp b/src/mc/snapshot/unitTest/mc_snapshot_unit_BOOST.cpp
index c07260f..e64472c 100644 (file)
--- a/src/mc/snapshot/unitTest/mc_snapshot_unit_BOOST.cpp
+++ b/src/mc/snapshot/unitTest/mc_snapshot_unit_BOOST.cpp
@@ -22,10 +22,10 @@ TODO: comment
 
 #include <sys/mman.h>
 
 
 #include <sys/mman.h>
 

-#include "simgrid/src/mc/mc_config.hpp"
-#include "simgrid/src/mc/mc_mmu.hpp"
-#include "simgrid/src/mc/mc_private.hpp"
-#include "simgrid/src/mc/mc_snapshot.hpp"
+#include "src/mc/mc_config.hpp"
+#include "src/mc/mc_mmu.hpp"
+#include "src/mc/mc_private.hpp"
+#include "src/mc/mc_snapshot.hpp"

 
 
 static inline void init_memory(void* mem, size_t size)
 
 
 static inline void init_memory(void* mem, size_t size)

diff --git a/tools/cmake/Tests.cmake b/tools/cmake/Tests.cmake
index 3604f8e..2e86d12 100644 (file)
--- a/tools/cmake/Tests.cmake
+++ b/tools/cmake/Tests.cmake
@@ -100,16 +100,16 @@ if(Boost_UNIT_TEST_FRAMEWORK_FOUND)
     APPEND PROPERTY
            INCLUDE_DIRECTORIES "${INTERNAL_INCLUDES}"
           )
     APPEND PROPERTY
            INCLUDE_DIRECTORIES "${INTERNAL_INCLUDES}"
           )

-  add_executable       (unit_snapshot src/mc/snapshot/unitTest/mc_snapshot_unit_BOOST.cpp)
-  # add_library(boost_unit_test_framework SHARED IMPORTED)
-  # set_target_properties(boost_unit_test_framework PROPERTIES IMPORTED_LOCATION ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY})
-  target_link_libraries(unit_snapshot simgrid boost_unit_test_framework)
-  ADD_TEST(unit_snapshot ${CMAKE_BINARY_DIR}/unit_tmgr --build_info=yes)
-  set_property(
-    TARGET unit_snapshot
-    APPEND PROPERTY
-           INCLUDE_DIRECTORIES "${INTERNAL_INCLUDES}"
-          )
+  if (SIMGRID_HAVE_MC)
+    add_executable       (unit_snapshot src/mc/snapshot/unitTest/mc_snapshot_unit_BOOST.cpp)
+    target_link_libraries(unit_snapshot simgrid boost_unit_test_framework)
+    ADD_TEST(unit_snapshot ${CMAKE_BINARY_DIR}/unit_snapshot --build_info=yes)
+    set_property(
+      TARGET unit_snapshot
+      APPEND PROPERTY
+             INCLUDE_DIRECTORIES "${INTERNAL_INCLUDES}"
+            )
+  endif()

 
 
 else()
 
 
 else()