if(WIN32)
- exec_program("java -d32 -version"
- OUTPUT_VARIABLE IS_32_BITS_JVM)
+ exec_program("java -d32 -version" OUTPUT_VARIABLE IS_32_BITS_JVM)
STRING( FIND ${IS_32_BITS_JVM} "Error" POSITION )
- if(${POSITION} GREATER -1)
- message("POTENTIAL ERROR: Java JVM needs to be 32 bits to be able to run with Simgrid on Windows for now")
+ if(NOT ${POSITION} GREATER -1)
+ message(fatal_error "SimGrid can only use Java 64 bits")
endif()
-
- set_target_properties(simgrid-java PROPERTIES
- LINK_FLAGS "-Wl,--subsystem,windows,--kill-at")
endif()
# Rules to build simgrid.jar
if(NOT STRIP_COMMAND)
set(STRIP_COMMAND "cmake -E echo (strip not found)")
endif()
- if(WIN32)
- set(STRIP_COMMAND "cmake -E echo (dont strip on windows)")
+ set(SG_SYSTEM_NAME ${CMAKE_SYSTEM_NAME})
+
+ if(${SG_SYSTEM_NAME} MATCHES "kFreeBSD")
+ set(SG_SYSTEM_NAME GNU/kFreeBSD)
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$")
- 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") )
- set(JAVA_NATIVE_PATH NATIVE/${CMAKE_SYSTEM_NAME}/amd64)
+ set(JAVA_NATIVE_PATH NATIVE/${SG_SYSTEM_NAME}/amd64)
endif()
add_custom_command(
add_dependencies(simgrid-java surf-java)
add_dependencies(simgrid-java_jar surf-java)
-if(WIN32)
- set_target_properties(surf-java PROPERTIES
- LINK_FLAGS "-Wl,--subsystem,windows,--kill-at")
-endif()