JNI refactoring

app/CMakeLists.txt

@@ -1,22 +1,20 @@
 
-cmake_minimum_required(VERSION 3.4.1)
+cmake_minimum_required(VERSION 3.6)
 
-add_definitions(-DHAVE_MEMRCHR)
+add_library(compact_enc_det SHARED
+	src/main/jni/charset.cc
+	src/main/jni/compact_enc_det/compact_enc_det/compact_enc_det.cc
+	src/main/jni/compact_enc_det/compact_enc_det/compact_enc_det_hint_code.cc
+	src/main/jni/compact_enc_det/util/encodings/encodings.cc
+	src/main/jni/compact_enc_det/util/languages/languages.cc
+)
 
-add_library( compact_enc_det
-             SHARED
-             src/main/jni/charset.cc
-             src/main/jni/compact_enc_det/compact_enc_det.cc
-             src/main/jni/compact_enc_det/compact_enc_det_hint_code.cc
-             src/main/jni/util/encodings/encodings.cc
-             src/main/jni/util/languages/languages.cc )
+include_directories(src/main/jni/compact_enc_det)
 
-include_directories( src/main/jni/ )
+find_library(log-lib log)
 
-find_library( log-lib
-              log )
+add_definitions(-DHAVE_MEMRCHR)
 
 target_compile_options(compact_enc_det PRIVATE -Wno-c++11-narrowing)
 
-target_link_libraries( compact_enc_det
-                       ${log-lib} )
+target_link_libraries(compact_enc_det ${log-lib})