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
[cmake] mark two variables as advanced to hide them from ccmake
[simgrid.git]
/
tools
/
cmake
/
Java.cmake
diff --git
a/tools/cmake/Java.cmake
b/tools/cmake/Java.cmake
index
9b79ab7
..
7288723
100644
(file)
--- a/
tools/cmake/Java.cmake
+++ b/
tools/cmake/Java.cmake
@@
-92,6
+92,7
@@
add_custom_command(
if(enable_lib_in_jar)
find_program(STRIP_COMMAND strip)
if(enable_lib_in_jar)
find_program(STRIP_COMMAND strip)
+ mark_as_advanced(STRIP_COMMAND)
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()
@@
-109,6
+110,9
@@
if(enable_lib_in_jar)
(${CMAKE_SYSTEM_PROCESSOR} MATCHES "AMD64") )
set(JAVA_NATIVE_PATH NATIVE/${SG_SYSTEM_NAME}/amd64)
endif()
(${CMAKE_SYSTEM_PROCESSOR} MATCHES "AMD64") )
set(JAVA_NATIVE_PATH NATIVE/${SG_SYSTEM_NAME}/amd64)
endif()
+ if(${CMAKE_SYSTEM_PROCESSOR} MATCHES "armv7l")
+ set(JAVA_NATIVE_PATH NATIVE/${SG_SYSTEM_NAME}/arm) # Default arm (soft-float ABI)
+ endif()
add_custom_command(
TARGET simgrid-java_jar POST_BUILD
add_custom_command(
TARGET simgrid-java_jar POST_BUILD