merge back the master trunk into the smpi branch

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

diff --git a/buildtools/Cmake/DefinePackages.cmake b/buildtools/Cmake/DefinePackages.cmake
index 8a97107..fac0192 100644 (file)
--- a/buildtools/Cmake/DefinePackages.cmake
+++ b/buildtools/Cmake/DefinePackages.cmake
@@ -16,7 +16,6 @@ set(EXTRA_DIST
        src/xbt/backtrace_windows.c
        src/xbt/backtrace_dummy.c
        src/xbt/setset_private.h
-       src/xbt/parmap_private.h
        src/xbt/mmalloc/attach.c
        src/xbt/mmalloc/detach.c        
        src/xbt/mmalloc/keys.c
@@ -225,14 +224,12 @@ set(SURF_SRC
        src/surf/surf.c
        src/surf/surfxml_parse.c
        src/surf/surfxml_parseplatf.c
-       src/surf/cpu.c
        src/surf/network.c
-       src/surf/network_im.c
        src/surf/network_constant.c
        src/surf/workstation.c
        src/surf/workstation_ptask_L07.c
        src/surf/cpu_ti.c
-       src/surf/cpu_im.c
+       src/surf/cpu_cas01.c
        src/surf/sg_platf.c
        src/xbt/xbt_sg_stubs.c
 )
@@ -693,7 +690,6 @@ set(add_src_files
        src/smpi/smpif2c.in
        src/smpi/smpiff.in
        src/smpi/smpirun.in
-       src/simix/smx_context_sysv_private.h
 )
 
 file(GLOB_RECURSE xml_files