[simix] Port JavaContext to C++

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

diff --git a/tools/cmake/DefinePackages.cmake b/tools/cmake/DefinePackages.cmake
index 8aa9d7c..03adb42 100644 (file)
--- a/tools/cmake/DefinePackages.cmake
+++ b/tools/cmake/DefinePackages.cmake
@@ -374,14 +374,14 @@ set(SIMIX_SRC
   )
 
 # Don't try to compile our inline assembly with MSVC
-if (1)
+if (MSVC)
   set(EXTRA_DIST
       ${EXTRA_DIST}
-      src/simix/smx_context_raw.cpp)
+      src/simix/RawContext.cpp)
 else()
   set(SIMIX_SRC
       ${SIMIX_SRC}
-      src/simix/smx_context_raw.cpp)
+      src/simix/RawContext.cpp)
 endif()
 
 # Boost context may not be available
@@ -495,7 +495,7 @@ set(JSURF_JAVA_GENERATED_SRC
 )
 
 set(JMSG_C_SRC
-  src/bindings/java/jmsg.c
+  src/bindings/java/jmsg.cpp
   src/bindings/java/jmsg.h
   src/bindings/java/jmsg_as.c
   src/bindings/java/jmsg_as.h
@@ -505,7 +505,7 @@ set(JMSG_C_SRC
   src/bindings/java/jmsg_file.h
   src/bindings/java/jmsg_host.c
   src/bindings/java/jmsg_host.h
-  src/bindings/java/jmsg_process.c
+  src/bindings/java/jmsg_process.cpp
   src/bindings/java/jmsg_process.h
   src/bindings/java/jmsg_rngstream.c
   src/bindings/java/jmsg_rngstream.h
@@ -517,10 +517,8 @@ set(JMSG_C_SRC
   src/bindings/java/jmsg_vm.h
   src/bindings/java/jxbt_utilities.c
   src/bindings/java/jxbt_utilities.h
-  src/bindings/java/smx_context_cojava.c
-  src/bindings/java/smx_context_cojava.h
-  src/bindings/java/smx_context_java.c
-  src/bindings/java/smx_context_java.h
+  src/bindings/java/JavaContext.cpp
+  src/bindings/java/JavaContext.hpp
   src/bindings/java/jmsg_storage.c
   src/bindings/java/jmsg_storage.h
 )