Revert "thread_local is C++11, remove the portability layer"

[simgrid.git] / tools / cmake / DefinePackages.cmake

diff --git a/tools/cmake/DefinePackages.cmake b/tools/cmake/DefinePackages.cmake
index f7a60cf..abbd3b1 100644 (file)
--- a/tools/cmake/DefinePackages.cmake
+++ b/tools/cmake/DefinePackages.cmake
@@ -60,20 +60,23 @@ set(EXTRA_DIST
   src/surf/xml/simgrid_dtd.h
   src/surf/xml/simgrid_dtd.c
   src/surf/xml/surfxml_sax_cb.cpp
   src/surf/xml/simgrid_dtd.h
   src/surf/xml/simgrid_dtd.c
   src/surf/xml/surfxml_sax_cb.cpp

+
+  src/surf/AsImpl.hpp
+  src/surf/AsCluster.hpp
+  src/surf/AsClusterFatTree.hpp
+  src/surf/AsClusterTorus.hpp
+  src/surf/AsDijkstra.hpp
+  src/surf/AsFloyd.hpp
+  src/surf/AsFull.hpp
+  src/surf/AsRoutedGraph.hpp
+  src/surf/AsNone.hpp
+  src/surf/AsVivaldi.hpp
+

   src/surf/storage_interface.hpp
   src/surf/storage_n11.hpp
   src/surf/surf_interface.hpp
   src/surf/surf_private.h
   src/surf/surf_routing.hpp
   src/surf/storage_interface.hpp
   src/surf/storage_n11.hpp
   src/surf/surf_interface.hpp
   src/surf/surf_private.h
   src/surf/surf_routing.hpp

-  src/surf/surf_routing_cluster.hpp
-  src/surf/surf_routing_cluster_fat_tree.hpp
-  src/surf/surf_routing_cluster_torus.hpp
-  src/surf/surf_routing_dijkstra.hpp
-  src/surf/surf_routing_floyd.hpp
-  src/surf/surf_routing_full.hpp
-  src/surf/surf_routing_RoutedGraph.hpp
-  src/surf/surf_routing_none.hpp
-  src/surf/surf_routing_vivaldi.hpp

   src/surf/vm_hl13.hpp
   src/surf/PropertyHolder.hpp
   src/surf/virtual_machine.hpp
   src/surf/vm_hl13.hpp
   src/surf/PropertyHolder.hpp
   src/surf/virtual_machine.hpp


@@ -291,6 +294,17 @@ set(NS3_SRC
   )
 
 set(SURF_SRC
   )
 
 set(SURF_SRC

+  src/surf/AsImpl.cpp
+  src/surf/AsCluster.cpp
+  src/surf/AsClusterFatTree.cpp
+  src/surf/AsClusterTorus.cpp
+  src/surf/AsDijkstra.cpp
+  src/surf/AsFloyd.cpp
+  src/surf/AsFull.cpp
+  src/surf/AsRoutedGraph.cpp
+  src/surf/AsNone.cpp
+  src/surf/AsVivaldi.cpp
+  

   src/surf/cpu_cas01.cpp
   src/surf/cpu_interface.cpp
   src/surf/cpu_ti.cpp
   src/surf/cpu_cas01.cpp
   src/surf/cpu_interface.cpp
   src/surf/cpu_ti.cpp


@@ -312,15 +326,6 @@ set(SURF_SRC
   src/surf/surf_c_bindings.cpp
   src/surf/surf_interface.cpp
   src/surf/surf_routing.cpp
   src/surf/surf_c_bindings.cpp
   src/surf/surf_interface.cpp
   src/surf/surf_routing.cpp

-  src/surf/surf_routing_cluster.cpp
-  src/surf/surf_routing_cluster_fat_tree.cpp
-  src/surf/surf_routing_cluster_torus.cpp
-  src/surf/surf_routing_dijkstra.cpp
-  src/surf/surf_routing_floyd.cpp
-  src/surf/surf_routing_full.cpp
-  src/surf/surf_routing_RoutedGraph.cpp
-  src/surf/surf_routing_none.cpp
-  src/surf/surf_routing_vivaldi.cpp

   src/surf/xml/platf.hpp
   src/surf/xml/platf_private.hpp
   src/surf/xml/surfxml_sax_cb.cpp
   src/surf/xml/platf.hpp
   src/surf/xml/platf_private.hpp
   src/surf/xml/surfxml_sax_cb.cpp


@@ -641,7 +646,7 @@ set(headers_to_install
   include/simgrid/link.h
   include/simgrid/s4u/forward.hpp
   include/simgrid/s4u/actor.hpp
   include/simgrid/link.h
   include/simgrid/s4u/forward.hpp
   include/simgrid/s4u/actor.hpp

-  include/simgrid/s4u/as.hpp
+  include/simgrid/s4u/As.hpp

   include/simgrid/s4u/async.hpp
   include/simgrid/s4u/comm.hpp
   include/simgrid/s4u/engine.hpp  
   include/simgrid/s4u/async.hpp
   include/simgrid/s4u/comm.hpp
   include/simgrid/s4u/engine.hpp  


@@ -679,6 +684,7 @@ set(headers_to_install
   include/xbt/log.h
   include/xbt/mallocator.h
   include/xbt/matrix.h
   include/xbt/log.h
   include/xbt/mallocator.h
   include/xbt/matrix.h

+  include/xbt/memory.hpp

   include/xbt/misc.h
   include/xbt/mmalloc.h
   include/xbt/module.h
   include/xbt/misc.h
   include/xbt/mmalloc.h
   include/xbt/module.h


@@ -781,7 +787,7 @@ if(WIN32)
     )
 endif()
 
     )
 endif()
 

-if(${HAVE_LUA})
+if(HAVE_LUA)

   set(simgrid_sources  ${simgrid_sources}  ${LUA_SRC})
 else()
   set(EXTRA_DIST       ${EXTRA_DIST}       ${LUA_SRC})
   set(simgrid_sources  ${simgrid_sources}  ${LUA_SRC})
 else()
   set(EXTRA_DIST       ${EXTRA_DIST}       ${LUA_SRC})