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 kFreeBSD
[simgrid.git]
/
tools
/
cmake
/
Java.cmake
diff --git
a/tools/cmake/Java.cmake
b/tools/cmake/Java.cmake
index
b763705
..
9b79ab7
100644
(file)
--- a/
tools/cmake/Java.cmake
+++ b/
tools/cmake/Java.cmake
@@
-35,15
+35,11
@@
target_link_libraries(simgrid-java simgrid)
if(WIN32)
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 )
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()
endif()
-
- set_target_properties(simgrid-java PROPERTIES
- LINK_FLAGS "-Wl,--subsystem,windows,--kill-at")
endif()
# Rules to build simgrid.jar
endif()
# Rules to build simgrid.jar
@@
-99,17
+95,19
@@
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()
- 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()
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(
@@
-179,7
+177,3
@@
set_target_properties(simgrid-java PROPERTIES SKIP_BUILD_RPATH ON)
add_dependencies(simgrid-java surf-java)
add_dependencies(simgrid-java_jar surf-java)
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()