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
try again to find this lib.. and don't crash if not found
[simgrid.git]
/
tools
/
cmake
/
Java.cmake
diff --git
a/tools/cmake/Java.cmake
b/tools/cmake/Java.cmake
index
405968e
..
6e8e951
100644
(file)
--- a/
tools/cmake/Java.cmake
+++ b/
tools/cmake/Java.cmake
@@
-135,9
+135,11
@@
if(enable_lib_in_jar)
if(MINGW)
find_library(WINPTHREAD_DLL
NAME winpthread winpthread-1
if(MINGW)
find_library(WINPTHREAD_DLL
NAME winpthread winpthread-1
- PATHS C:\\MinGW C:\\MinGW64 C:\\MinGW\\bin C:\\MinGW64\\bin
+ PATHS C:\\MinGW C:\\MinGW64 C:\\MinGW\\bin C:\\MinGW64\\bin
C:\\msys64\\mingw32\\bin C:\\msys64\\mingw32 C:\\msys\\mingw32\\bin C:\\msys\\mingw32 C:\\msys64\\mingw64\\bin C:\\msys64\\mingw64 C:\\msys\\mingw64\\bin C:\\msys\\mingw64
)
)
- set(JAVALIBS ${JAVALIBS} ${WINPTHREAD_DLL})
+ if(${WINPTHREAD_DLL})
+ set(JAVALIBS ${JAVALIBS} ${WINPTHREAD_DLL})
+ endif()
endif(MINGW)
add_custom_command(
endif(MINGW)
add_custom_command(
@@
-167,7
+169,7
@@
include_directories(${JNI_INCLUDE_DIRS} ${JAVA_INCLUDE_PATH} ${JAVA_INCLUDE_PATH
set_target_properties(simgrid-java PROPERTIES SKIP_BUILD_RPATH ON)
set_target_properties(simgrid-java PROPERTIES SKIP_BUILD_RPATH ON)
-add_dependencies(simgrid-java
simgrid
)
+add_dependencies(simgrid-java
_jar simgrid-java
)
add_dependencies(simgrid-java_jar simgrid)
add_dependencies(simgrid-java_jar simgrid)