From: Martin Quinson <martin.quinson@loria.fr>
Date: Fri, 25 Sep 2015 06:58:42 +0000 (+0200)
Subject: also unifies the native path between cmake and java on windows
X-Git-Tag: v3_12~121
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/b7b02824bfdcff6862946305aea8e8d72ad607dd

also unifies the native path between cmake and java on windows
---

diff --git a/src/bindings/java/org/simgrid/NativeLib.java b/src/bindings/java/org/simgrid/NativeLib.java
index 54dad77a52..4e61de9c82 100644
--- a/src/bindings/java/org/simgrid/NativeLib.java
+++ b/src/bindings/java/org/simgrid/NativeLib.java
@@ -22,6 +22,8 @@ public final class NativeLib {
 			arch = "x86";
 		else if (arch.equalsIgnoreCase("x86_64"))
 			arch = "amd64";
+		else if (arch.equalsIgnoreCase("AMD64"))
+			arch = "amd64";
 
 		if (os.toLowerCase().startsWith("win")){
 			os = "Windows";
diff --git a/tools/cmake/MakeJava.cmake b/tools/cmake/MakeJava.cmake
index 4d93dbcdfa..c8a52f9ad4 100644
--- a/tools/cmake/MakeJava.cmake
+++ b/tools/cmake/MakeJava.cmake
@@ -76,7 +76,8 @@ set(JAVA_NATIVE_PATH NATIVE/${CMAKE_SYSTEM_NAME}/${CMAKE_SYSTEM_PROCESSOR})
 if(${CMAKE_SYSTEM_PROCESSOR} MATCHES "^i[3-6]86$")
   set(JAVA_NATIVE_PATH NATIVE/${CMAKE_SYSTEM_NAME}/x86)
 endif()
-if(${CMAKE_SYSTEM_PROCESSOR} MATCHES "x86_64")
+if(  (${CMAKE_SYSTEM_PROCESSOR} MATCHES "x86_64") OR
+     (${CMAKE_SYSTEM_PROCESSOR} MATCHES "AMD64")     )
   set(JAVA_NATIVE_PATH NATIVE/${CMAKE_SYSTEM_NAME}/amd64)
 endif()