diff options
Diffstat (limited to 'java_fat/CMakeLists.txt')
| -rw-r--r-- | java_fat/CMakeLists.txt | 34 |
1 files changed, 5 insertions, 29 deletions
diff --git a/java_fat/CMakeLists.txt b/java_fat/CMakeLists.txt index f29b6b09..c09c97b2 100644 --- a/java_fat/CMakeLists.txt +++ b/java_fat/CMakeLists.txt @@ -11,10 +11,9 @@ # set(direct_bt_jar_file ${CMAKE_CURRENT_BINARY_DIR}/direct_bt.jar CACHE FILEPATH "direct_bt jar file" FORCE) set(direct_bt_fat_jar_file ${CMAKE_CURRENT_BINARY_DIR}/direct_bt-fat.jar CACHE FILEPATH "direct_bt fat jar file" FORCE) -set(direct_bt_fat2_jar_file ${CMAKE_CURRENT_BINARY_DIR}/direct_bt-fat2.jar CACHE FILEPATH "direct_bt fat2 jar file" FORCE) set(direct_bt_java_src_file ${CMAKE_CURRENT_BINARY_DIR}/direct_bt-java-src.zip CACHE FILEPATH "direct_bt java source file" FORCE) -add_custom_command (OUTPUT ${direct_bt_fat_jar_file} ${direct_bt_fat2_jar_file} ${direct_bt_java_src_file} +add_custom_command (OUTPUT ${direct_bt_fat_jar_file} ${direct_bt_java_src_file} WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMAND ${CMAKE_COMMAND} -D_srcdir=${CMAKE_CURRENT_BINARY_DIR}/../src/direct_bt @@ -32,28 +31,7 @@ add_custom_command (OUTPUT ${direct_bt_fat_jar_file} ${direct_bt_fat2_jar_file} -D _dstdir:PATH='${CMAKE_CURRENT_BINARY_DIR}/temp' -D _archives:FILEPATH="${jaulib_fat_jar_file}" -P ${CMAKE_CURRENT_SOURCE_DIR}/../cmake/modules/ExtractArchiveList.cmake - COMMAND ${JAR} - --create --file ${direct_bt_fat2_jar_file} - --manifest ${CMAKE_CURRENT_BINARY_DIR}/manifest-fat2.txt - -C ${CMAKE_CURRENT_BINARY_DIR}/temp/ jau - -C ${CMAKE_CURRENT_BINARY_DIR}/temp/ org - -C ${CMAKE_CURRENT_BINARY_DIR}/temp/ natives - -C ${CMAKE_CURRENT_BINARY_DIR}/../java/${CMAKE_FILES_DIRECTORY}/direct_bt_jar.dir/ jau - -C ${CMAKE_CURRENT_BINARY_DIR}/../java/${CMAKE_FILES_DIRECTORY}/direct_bt_jar.dir/ org - -C ${CMAKE_CURRENT_BINARY_DIR}/ natives - COMMAND ${CMAKE_COMMAND} - -D_srcdir=${CMAKE_CURRENT_BINARY_DIR}/../src/tinyb - -D_dstdir=${CMAKE_CURRENT_BINARY_DIR}/natives/${OS_AND_ARCH} - -D_srcbasename=${CMAKE_SHARED_LIBRARY_PREFIX}tinyb${CMAKE_SHARED_LIBRARY_SUFFIX}.${tinyb_VERSION_STRING} - -D_dstbasename=${CMAKE_SHARED_LIBRARY_PREFIX}tinyb${CMAKE_SHARED_LIBRARY_SUFFIX} - -P ${CMAKE_CURRENT_SOURCE_DIR}/../cmake/modules/FileCopyS2D.cmake - COMMAND ${CMAKE_COMMAND} - -D_srcdir=${CMAKE_CURRENT_BINARY_DIR}/../java/jni/tinyb - -D_dstdir=${CMAKE_CURRENT_BINARY_DIR}/natives/${OS_AND_ARCH} - -D_srcbasename=${CMAKE_SHARED_LIBRARY_PREFIX}javatinyb${CMAKE_SHARED_LIBRARY_SUFFIX}.${tinyb_VERSION_STRING} - -D_dstbasename=${CMAKE_SHARED_LIBRARY_PREFIX}javatinyb${CMAKE_SHARED_LIBRARY_SUFFIX} - -P ${CMAKE_CURRENT_SOURCE_DIR}/../cmake/modules/FileCopyS2D.cmake COMMAND ${JAR} --create --file ${direct_bt_fat_jar_file} --manifest ${CMAKE_CURRENT_BINARY_DIR}/manifest-fat.txt @@ -62,7 +40,6 @@ add_custom_command (OUTPUT ${direct_bt_fat_jar_file} ${direct_bt_fat2_jar_file} -C ${CMAKE_CURRENT_BINARY_DIR}/temp/ natives -C ${CMAKE_CURRENT_BINARY_DIR}/../java/${CMAKE_FILES_DIRECTORY}/direct_bt_jar.dir/ jau -C ${CMAKE_CURRENT_BINARY_DIR}/../java/${CMAKE_FILES_DIRECTORY}/direct_bt_jar.dir/ org - -C ${CMAKE_CURRENT_BINARY_DIR}/../java/${CMAKE_FILES_DIRECTORY}/direct_bt_jar.dir/ tinyb -C ${CMAKE_CURRENT_BINARY_DIR}/ natives COMMAND ${JAR} @@ -70,18 +47,17 @@ add_custom_command (OUTPUT ${direct_bt_fat_jar_file} ${direct_bt_fat2_jar_file} --no-manifest -C ${CMAKE_CURRENT_SOURCE_DIR}/../java jau -C ${CMAKE_CURRENT_SOURCE_DIR}/../java org - -C ${CMAKE_CURRENT_SOURCE_DIR}/../java tinyb - DEPENDS jaulib_fat_jar direct_bt tinyb direct_bt_jar javadirect_bt javatinyb + DEPENDS jaulib_fat_jar direct_bt direct_bt_jar javadirect_bt COMMENT "producing direct_bt [fat] jar files and its java source zip" VERBATIM ) add_custom_target (direct_bt_fat_jar ALL - DEPENDS ${direct_bt_fat_jar_file} ${direct_bt_fat2_jar_file} ${direct_bt_java_src_file} + DEPENDS ${direct_bt_fat_jar_file} ${direct_bt_java_src_file} ) -add_dependencies(direct_bt_fat_jar jaulib_fat_jar direct_bt tinyb direct_bt_jar javadirect_bt javatinyb) +add_dependencies(direct_bt_fat_jar jaulib_fat_jar direct_bt direct_bt_jar javadirect_bt) -install (FILES ${direct_bt_fat_jar_file} ${direct_bt_fat2_jar_file} ${direct_bt_java_src_file} DESTINATION ${CMAKE_INSTALL_LIBDIR}/../lib/java) +install (FILES ${direct_bt_fat_jar_file} ${direct_bt_java_src_file} DESTINATION ${CMAKE_INSTALL_LIBDIR}/../lib/java) |