SGJP / Morfeusz

Commit b080a57f803222f84f8fd173df92c48e6e987a52

Authored by Michał Lenart
1 parent 13cd3102
master ... ubu18

poprawienie niedziałającej javy 

git-svn-id: svn://svn.nlp.ipipan.waw.pl/morfeusz/morfeusz@133 ff4e3ee1-f430-4e82-ade0-24591c43f1fd
Inline Side-by-side
Showing 3 changed files with 22 additions and 0 deletions
morfeusz/CMakeLists.txt
  View file @b080a57
... ... @@ -77,6 +77,13 @@ endif ()
77 77 add_subdirectory (java)
78 78 add_subdirectory (python)
79 79  
  80 +if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
  81 + add_custom_target (morfeusz-repair-library
  82 + COMMAND ${INSTALL_NAME_TOOL} -id libmorfeusz2.dylib ${CMAKE_CURRENT_BINARY_DIR}/libmorfeusz2.dylib
  83 + DEPENDS libmorfeusz)
  84 + add_dependencies (morfeusz_analyzer morfeusz-repair-library)
  85 +endif ()
  86 +
80 87 install (FILES ${INCLUDE_FILES} DESTINATION include/morfeusz)
81 88 install (TARGETS libmorfeusz DESTINATION ${TARGET_LIB_DIR})
82 89 install (TARGETS morfeusz_analyzer morfeusz_generator DESTINATION bin)
... ...
morfeusz/Toolchain-Darwin-amd64.cmake
  View file @b080a57
... ... @@ -11,6 +11,8 @@ set (CMAKE_SYSTEM_PROCESSOR "x86_64")
11 11 set (JAVA_ROOT ${DARWIN64_ROOT}/JavaVM.framework)
12 12 set (PYTHON_ROOT ${DARWIN64_ROOT}/Python.framework/Versions/2.7)
13 13  
  14 +set (INSTALL_NAME_TOOL ${DARWIN64_ROOT}/x86_64-apple-darwin9/bin/x86_64-apple-darwin9-install_name_tool)
  15 +
14 16 # here is the target environment located
15 17 set (CMAKE_FIND_ROOT_PATH ${DARWIN64_ROOT}/x86_64-apple-darwin9 ${JAVA_ROOT} ${PYTHON_ROOT})
16 18  
... ...
morfeusz/java/CMakeLists.txt
  View file @b080a57
... ... @@ -37,6 +37,15 @@ endif ()
37 37 set (CMAKE_JAVA_TARGET_VERSION ${JMORFEUSZ_VERSION})
38 38 set (CMAKE_JAVA_TARGET_OUTPUT_NAME jmorfeusz)
39 39  
  40 +if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
  41 + get_filename_component (LIBMORFEUSZ_DIR ${CMAKE_CURRENT_BINARY_DIR} DIRECTORY)
  42 + add_custom_target (jmorfeusz-repair-libmorfeusz-link
  43 + COMMAND ${INSTALL_NAME_TOOL} -change ${LIBMORFEUSZ_DIR}/libmorfeusz2.dylib libmorfeusz2.dylib ${CMAKE_CURRENT_BINARY_DIR}/libjmorfeusz.jnilib
  44 + DEPENDS libjmorfeusz)
  45 + add_custom_target (jmorfeusz-repair-libjmorfeusz-id
  46 + COMMAND ${INSTALL_NAME_TOOL} -id libjmorfeusz.jnilib ${CMAKE_CURRENT_BINARY_DIR}/libjmorfeusz.jnilib
  47 + DEPENDS libjmorfeusz jmorfeusz-repair-libmorfeusz-link)
  48 +endif ()
40 49 #~ add_custom_target (jmorfeusz-repair-library
41 50 #~ COMMAND ${DARWIN64_ROOT}/x86_64-apple-darwin9/bin/x86_64-apple-darwin9-install_name_tool -change /home/mlenart/xxx/morfeusz/buildall/build-Darwin-amd64/morfeusz/libmorfeusz2.dylib morfeusz2 ${PROJECT_BINARY_DIR}/morfeusz/java/libjmorfeusz.jnilib
42 51 #~ DEPENDS libjmorfeusz)
... ... @@ -47,6 +56,10 @@ add_jar (jmorfeusz
47 56 SOURCES "${JAVA_SOURCES}"
48 57 DEPENDS libjmorfeusz)
49 58  
  59 +if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
  60 + add_dependencies(jmorfeusz jmorfeusz-repair-libmorfeusz-link jmorfeusz-repair-libjmorfeusz-id)
  61 +endif ()
  62 +
50 63 add_custom_target (jmorfeusz-copy-readme
51 64 COMMAND ${CMAKE_COMMAND} -E copy "${CMAKE_CURRENT_SOURCE_DIR}/README" "${CMAKE_CURRENT_BINARY_DIR}/README")
52 65  
... ...