conclude merge

CMakeLists.txt

@@ -4,9 +4,9 @@ include(Utilities)
 project(KinesisVideoProducerCpp)
 
 project(KinesisVideoProducerCpp VERSION 3.4.0)
+include(GNUInstallDirs)
 
 set(CMAKE_CXX_STANDARD 11)
-include(GNUInstallDirs)
 
 # User Flags
 option(BUILD_GSTREAMER_PLUGIN "Build kvssink GStreamer plugin" OFF)
@@ -216,9 +216,17 @@ install(
 if(BUILD_JNI)
   find_package(JNI REQUIRED)
   include_directories(${JNI_INCLUDE_DIRS})
-
+  install(
+    DIRECTORY ${KINESIS_VIDEO_PRODUCER_CPP_SRC}/src/JNI/include
+    DESTINATION .)
   add_library(KinesisVideoProducerJNI SHARED ${JNI_HEADERS} ${JNI_SOURCE_FILES})
   target_link_libraries(KinesisVideoProducerJNI kvspic)
+
+  install(
+    TARGETS KinesisVideoProducerJNI
+    ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}"
+    LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}"
+    RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}")
 endif()