Logo AND Algorithmique Numérique Distribuée

Public GIT Repository
[cmake] mark two variables as advanced to hide them from ccmake
[simgrid.git] / tools / cmake / Java.cmake
index d73314c..7288723 100644 (file)
@@ -92,6 +92,7 @@ add_custom_command(
 
 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()
@@ -100,9 +101,6 @@ if(enable_lib_in_jar)
   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/${SG_SYSTEM_NAME}/${CMAKE_SYSTEM_PROCESSOR})
   if(${CMAKE_SYSTEM_PROCESSOR} MATCHES "^i[3-6]86$")
@@ -112,6 +110,9 @@ if(enable_lib_in_jar)
        (${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