Windows compatibility.

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

diff --git a/buildtools/Cmake/DefinePackages.cmake b/buildtools/Cmake/DefinePackages.cmake
index ddeb0e4..ed0ef31 100755 (executable)
--- a/buildtools/Cmake/DefinePackages.cmake
+++ b/buildtools/Cmake/DefinePackages.cmake
@@ -321,6 +321,7 @@ set(AMOK_SRC
 set(LUA_SRC
        src/simix/smx_context_lua.c
        src/bindings/lua/simgrid_lua.c
+       src/bindings/lua/lua_stub_generator.c
 )
 
 set(TRACING_SRC
@@ -333,6 +334,7 @@ set(TRACING_SRC
        src/instr/msg_volume.c
        src/instr/smx_instr.c
        src/instr/surf_instr.c
+       src/instr/smpi_instr.c
        src/instr/variables_instr.c
        src/instr/private.h
 )
@@ -443,7 +445,7 @@ src/xbt/xbt_synchro.c
 
 ### depend of some variables setted upper
 # -->CONTEXT_THREADS
-if(${CONTEXT_THREADS} OR WIN32)
+if(${CONTEXT_THREADS}) #pthread
        set(SURF_SRC
                ${SURF_SRC}
                src/xbt/xbt_os_thread.c
@@ -453,17 +455,27 @@ if(${CONTEXT_THREADS} OR WIN32)
                ${EXTRA_DIST}
                src/simix/smx_context_sysv.c
        )
-else(${CONTEXT_THREADS} OR WIN32)
+else(${CONTEXT_THREADS}) #ucontext
        set(SURF_SRC
                ${SURF_SRC}
                src/simix/smx_context_sysv.c
        )
-       set(EXTRA_DIST
-               ${EXTRA_DIST}
-               src/xbt/xbt_os_thread.c
-               src/simix/smx_context_thread.c
-       )
-endif(${CONTEXT_THREADS} OR WIN32)
+
+       if(WIN32)
+       set(SURF_SRC
+               ${SURF_SRC}
+               src/xbt/xbt_os_thread.c
+               src/simix/smx_context_thread.c)
+    else(WIN32)
+       set(EXTRA_DIST
+               ${EXTRA_DIST}
+               src/xbt/xbt_os_thread.c
+               src/simix/smx_context_thread.c)
+    endif(WIN32)
+endif(${CONTEXT_THREADS})
+
+
+
 
 # -->HAVE_GTNETS
 if(HAVE_GTNETS)