diff --git a/CMakeLists.txt b/CMakeLists.txt index 4e7a7c976..d420f9c22 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -126,10 +126,6 @@ elseif(FORCE_M64) # Build 64-bit binary on Linux set_target_properties(jssc PROPERTIES COMPILE_FLAGS -m64 LINK_FLAGS -m64) endif() -# Copy native library back to source tree -add_custom_command(TARGET jssc POST_BUILD - COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_CURRENT_BINARY_DIR}/natives/ ${CMAKE_CURRENT_SOURCE_DIR}/src/main/resources-precompiled/natives/ -) # Call strip on non-debug builds if(CMAKE_STRIP AND NOT CMAKE_BUILD_TYPE MATCHES "Deb") @@ -139,6 +135,11 @@ if(CMAKE_STRIP AND NOT CMAKE_BUILD_TYPE MATCHES "Deb") add_custom_command(TARGET jssc POST_BUILD COMMAND "${CMAKE_STRIP}" ${STRIP_ARGS} $) endif() +# Copy native library back to source tree +add_custom_command(TARGET jssc POST_BUILD + COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_CURRENT_BINARY_DIR}/natives/ ${CMAKE_CURRENT_SOURCE_DIR}/src/main/resources-precompiled/natives/ +) + # Handle compiler warnings if(MSVC) #TODO Treat warnings as errors /WX diff --git a/pom.xml b/pom.xml index 13d361f84..e81ed66ce 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ io.github.java-native.jssc jssc - 2.9.0 + 2.9.1 1.6 diff --git a/src/java/jssc/SerialNativeInterface.java b/src/java/jssc/SerialNativeInterface.java index 2c8ed8a8b..53be0a2df 100644 --- a/src/java/jssc/SerialNativeInterface.java +++ b/src/java/jssc/SerialNativeInterface.java @@ -35,7 +35,7 @@ public class SerialNativeInterface { private static final String libVersion = "2.9"; - private static final String libMinorSuffix = "0"; //since 0.9.0 + private static final String libMinorSuffix = "1"; //since 0.9.0 public static final int OS_LINUX = 0; public static final int OS_WINDOWS = 1; diff --git a/src/main/resources-precompiled/natives/osx_64/libjssc.dylib b/src/main/resources-precompiled/natives/osx_64/libjssc.dylib index 06da97fc5..ec77e8cc2 100755 Binary files a/src/main/resources-precompiled/natives/osx_64/libjssc.dylib and b/src/main/resources-precompiled/natives/osx_64/libjssc.dylib differ