|
|
@@ -20,7 +20,6 @@ FILE(GLOB JSON_ROOT_CPP
|
|
|
include_directories(${JSON_HEADER})
|
|
|
|
|
|
|
|
|
-
|
|
|
############################################# 加入jni支持############################################
|
|
|
message(FIND JAVA_HOME---> $ENV{JAVA_HOME})
|
|
|
set(JAVA_HOME $ENV{JAVA_HOME})
|
|
|
@@ -86,12 +85,14 @@ link_directories(${FFMPEG_LIBS})
|
|
|
add_library(piaoquan_java_opencv SHARED
|
|
|
${Project_SRC}
|
|
|
${UTILS_SRC}
|
|
|
+ ${JSON_ROOT_CPP}
|
|
|
+ ${FFMPEG_SRC}
|
|
|
${JAVA_JNI_SRC})
|
|
|
|
|
|
-add_library(video_similarity_detection SHARED
|
|
|
- ${UTILS_SRC}
|
|
|
- ${JSON_ROOT_CPP}
|
|
|
- ${Project_SRC})
|
|
|
+#add_library(video_similarity_detection SHARED
|
|
|
+# ${UTILS_SRC}
|
|
|
+# ${JSON_ROOT_CPP}
|
|
|
+# ${Project_SRC})
|
|
|
|
|
|
set(FFmpeg_LIBS
|
|
|
-lavcodec
|
|
|
@@ -184,8 +185,9 @@ else ()
|
|
|
message("else:${CMAKE_C_FLAGS_RELEASE}")
|
|
|
endif ()
|
|
|
|
|
|
-target_link_libraries(piaoquan_java_opencv
|
|
|
+target_link_libraries(piaoquan_java_opencv -lpthread
|
|
|
${OpenCV_LIBS}
|
|
|
+ ${FFmpeg_LIBS}
|
|
|
)
|
|
|
|
|
|
add_executable(video_similarity_comparison src/video_similarity_comparison.cpp
|
|
|
@@ -200,4 +202,3 @@ target_link_libraries(video_similarity_comparison -lpthread
|
|
|
)
|
|
|
|
|
|
|
|
|
-
|
DevYK