diff options
| author | Sven Gothel <[email protected]> | 2022-02-07 14:25:01 +0100 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2022-02-07 14:25:01 +0100 |
| commit | cfeee9cca321fe41220f4d91d9d95863a966efd4 (patch) | |
| tree | 9f8664d2ae3c8142063e1f0a4862e96f12965df4 /java_jni | |
| parent | e3c6a5f8858f0e0142f48a84fa250280c2b9f9b4 (diff) | |
git version info: Added post-tag: VERSION_COMMITS and VERSION_SHA1_SHORT. VERSION_LONG reflects post-tag and dirty. Added mapping to project version var-names.
Diffstat (limited to 'java_jni')
| -rw-r--r-- | java_jni/jni/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | java_jni/manifest.txt.in | 10 |
2 files changed, 7 insertions, 7 deletions
diff --git a/java_jni/jni/CMakeLists.txt b/java_jni/jni/CMakeLists.txt index 800eaef..bc3c3f0 100644 --- a/java_jni/jni/CMakeLists.txt +++ b/java_jni/jni/CMakeLists.txt @@ -31,7 +31,7 @@ target_link_libraries(jaulib_jni_jni ${JNI_LIBRARIES} jaulib) if(USE_STRIP) add_custom_command(TARGET jaulib_jni_jni POST_BUILD - COMMAND ${STRIP} ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_SHARED_LIBRARY_PREFIX}jaulib_jni_jni${CMAKE_SHARED_LIBRARY_SUFFIX}.${jaulib_VERSION_STRING} + COMMAND ${STRIP} ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_SHARED_LIBRARY_PREFIX}jaulib_jni_jni${CMAKE_SHARED_LIBRARY_SUFFIX}.${jaulib_VERSION_SHORT} COMMENT "stripping jaulib_jni_jni" VERBATIM ) @@ -41,7 +41,7 @@ set_target_properties( jaulib_jni_jni PROPERTIES SOVERSION ${jaulib_VERSION_MAJOR} - VERSION ${jaulib_VERSION_STRING} + VERSION ${jaulib_VERSION_SHORT} ) install(TARGETS jaulib_jni_jni LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}) diff --git a/java_jni/manifest.txt.in b/java_jni/manifest.txt.in index 7f70c4c..bd0201e 100644 --- a/java_jni/manifest.txt.in +++ b/java_jni/manifest.txt.in @@ -3,19 +3,19 @@ Bundle-Date: @BUILD_TSTAMP@ Bundle-ManifestVersion: 2 Bundle-Name: org.jau.sys.dl Bundle-SymbolicName: org.jau.sys.dl -Bundle-Version: @VERSION_SHORT@ +Bundle-Version: @jaulib_VERSION_SHORT@ Export-Package: org.jau.sys.dl Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version=1.9))" Package-Title: org.jau.sys.dl Package-Vendor: Gothel Software -Package-Version: @VERSION_SHORT@ +Package-Version: @jaulib_VERSION_SHORT@ Specification-Title: Jaulib JNI Specification-Vendor: Gothel Software -Specification-Version: @VERSION_API@ +Specification-Version: @jaulib_VERSION_API@ Implementation-Title: Jaulib JNI Implementation-Vendor: Gothel Software -Implementation-Version: @VERSION@ -Implementation-Commit: @VERSION_SHA1@ +Implementation-Version: @jaulib_VERSION_LONG@ +Implementation-Commit: @jaulib_VERSION_SHA1@ Implementation-URL: http://www.jausoft.com/ Extension-Name: org.jau.sys.dl Trusted-Library: true |