Merge branch 'master' of scm.gforge.inria.fr:/gitroot/simgrid/simgrid into tomerge

[simgrid.git] / buildtools / Cmake / DefinePackages.cmake

diff --git a/buildtools/Cmake/DefinePackages.cmake b/buildtools/Cmake/DefinePackages.cmake
index 2b699db..7bd63de 100644 (file)
--- a/buildtools/Cmake/DefinePackages.cmake
+++ b/buildtools/Cmake/DefinePackages.cmake
@@ -393,6 +393,7 @@ endif()
 
 set(SIMGRID_SRC
   src/simgrid/sg_config.c
+  src/simgrid/host.cpp
   src/simgrid/util.hpp
   )
 
@@ -464,7 +465,7 @@ set(JSURF_JAVA_GENERATED_SRC
   src/bindings/java/org/simgrid/surf/LmmVariable.java
   src/bindings/java/org/simgrid/surf/Model.java
   src/bindings/java/org/simgrid/surf/NetworkAction.java
-  src/bindings/java/org/simgrid/surf/NetworkLink.java
+  src/bindings/java/org/simgrid/surf/Link.java
   src/bindings/java/org/simgrid/surf/Plugin.java
   src/bindings/java/org/simgrid/surf/Resource.java
   src/bindings/java/org/simgrid/surf/ResourceState.java
@@ -687,6 +688,8 @@ set(headers_to_install
   include/simgrid/platf_generator.h
   include/simgrid/plugins.h
   include/simgrid/simix.h
+  include/simgrid/host.h
+  include/simgrid/link.h
   include/smpi/mpi.h
   include/smpi/smpi.h
   include/smpi/smpi_cocci.h