Commit 05abb3a075ae269eb4883cd7a236665a8860a6e5
1 parent
145834ff
poprawki w zależnościach javy
git-svn-id: svn://svn.nlp.ipipan.waw.pl/morfeusz/morfeusz@161 ff4e3ee1-f430-4e82-ade0-24591c43f1fd
Showing
1 changed file
with
2 additions
and
2 deletions
morfeusz/java/CMakeLists.txt
... | ... | @@ -23,7 +23,7 @@ add_custom_command ( |
23 | 23 | add_library (libjmorfeusz SHARED ${SWIG_JAVA_OUTFILE}) |
24 | 24 | set_target_properties (libjmorfeusz PROPERTIES OUTPUT_NAME "jmorfeusz") |
25 | 25 | target_link_libraries (libjmorfeusz ${JAVA_LIBRARIES} libmorfeusz) |
26 | -add_dependencies (libjmorfeusz ${SWIG_JAVA_OUTFILE}) | |
26 | +add_dependencies (libjmorfeusz ${SWIG_JAVA_OUTFILE} libmorfeusz) | |
27 | 27 | |
28 | 28 | if (${CMAKE_SYSTEM_NAME} MATCHES "Windows") |
29 | 29 | set (CMAKE_SHARED_LINKER_FLAGS "-s -Os -static-libstdc++ -static-libgcc -D_JNI_IMPLEMENTATION_ -Wl,--kill-at") |
... | ... | @@ -54,7 +54,7 @@ endif () |
54 | 54 | file(GLOB_RECURSE JAVA_SOURCES ${JAVA_SRC_DIR} "*.java") |
55 | 55 | add_jar (jmorfeusz |
56 | 56 | SOURCES "${JAVA_SOURCES}" |
57 | - DEPENDS libjmorfeusz) | |
57 | + DEPENDS libjmorfeusz ${SWIG_JAVA_OUTFILE}) | |
58 | 58 | |
59 | 59 | if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin") |
60 | 60 | add_dependencies(jmorfeusz jmorfeusz-repair-libmorfeusz-link jmorfeusz-repair-libjmorfeusz-id) |
... | ... |