A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[java] port to armv7l
[simgrid.git]
/
tools
/
cmake
/
Java.cmake
diff --git
a/tools/cmake/Java.cmake
b/tools/cmake/Java.cmake
index
689f119
..
d73314c
100644
(file)
--- a/
tools/cmake/Java.cmake
+++ b/
tools/cmake/Java.cmake
@@
-95,14
+95,22
@@
if(enable_lib_in_jar)
if(NOT STRIP_COMMAND)
set(STRIP_COMMAND "cmake -E echo (strip not found)")
endif()
if(NOT STRIP_COMMAND)
set(STRIP_COMMAND "cmake -E echo (strip not found)")
endif()
+ set(SG_SYSTEM_NAME ${CMAKE_SYSTEM_NAME})
+
+ if(${SG_SYSTEM_NAME} MATCHES "kFreeBSD")
+ set(SG_SYSTEM_NAME GNU/kFreeBSD)
+ endif()
+ if(${SG_SYSTEM_NAME} MATCHES "armv7l")
+ set(SG_SYSTEM_NAME arm) # Default arm (soft-float ABI)
+ endif()
- set(JAVA_NATIVE_PATH NATIVE/${
CMAKE
_SYSTEM_NAME}/${CMAKE_SYSTEM_PROCESSOR})
+ set(JAVA_NATIVE_PATH NATIVE/${
SG
_SYSTEM_NAME}/${CMAKE_SYSTEM_PROCESSOR})
if(${CMAKE_SYSTEM_PROCESSOR} MATCHES "^i[3-6]86$")
if(${CMAKE_SYSTEM_PROCESSOR} MATCHES "^i[3-6]86$")
- set(JAVA_NATIVE_PATH NATIVE/${
CMAKE
_SYSTEM_NAME}/x86)
+ set(JAVA_NATIVE_PATH NATIVE/${
SG
_SYSTEM_NAME}/x86)
endif()
if( (${CMAKE_SYSTEM_PROCESSOR} MATCHES "x86_64") OR
(${CMAKE_SYSTEM_PROCESSOR} MATCHES "AMD64") )
endif()
if( (${CMAKE_SYSTEM_PROCESSOR} MATCHES "x86_64") OR
(${CMAKE_SYSTEM_PROCESSOR} MATCHES "AMD64") )
- set(JAVA_NATIVE_PATH NATIVE/${
CMAKE
_SYSTEM_NAME}/amd64)
+ set(JAVA_NATIVE_PATH NATIVE/${
SG
_SYSTEM_NAME}/amd64)
endif()
add_custom_command(
endif()
add_custom_command(