Fix installation paths for plugins

diff --git a/backendplugins/CMakeLists.txt b/backendplugins/CMakeLists.txt
index fd4dd74f520a9ffb576681f61a5bfafe62cad629..71355c017c5f9d432be6dee963d2258ad1a5fd05 100644 (file)
--- a/backendplugins/CMakeLists.txt
+++ b/backendplugins/CMakeLists.txt
@@ -2,6 +2,12 @@ project(backendplugins)
 
 set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/backendplugins)
 
+if(WIN32)
+    set(INSTALL_DESTINATION "bin/backendplugins")
+else()
+    set(INSTALL_DESTINATION "lib${LIB_SUFFIX}/aniplayer/backendplugins")
+endif()
+
 if (WITH_BACKEND_MPV)
     add_subdirectory(backend_mpv)
 endif()

diff --git a/backendplugins/backend_mpv/CMakeLists.txt b/backendplugins/backend_mpv/CMakeLists.txt
index 35fb033bf1ddb67323c48152cc3a4fef07430867..70651b1bdeaef8dace3d19a6147b0b83a4008663 100644 (file)
--- a/backendplugins/backend_mpv/CMakeLists.txt
+++ b/backendplugins/backend_mpv/CMakeLists.txt
@@ -40,12 +40,6 @@ target_link_libraries(backend_mpv ${backend_mpv_LIBS})
 
 add_definitions(-DBACKEND_MPV_LIBRARY)
 
-if(WIN32)
-    set(INSTALL_DESTINATION "aniplayer/uiplugins")
-else()
-    set(INSTALL_DESTINATION "lib${LIB_SUFFIX}/aniplayer/uiplugins")
-endif()
-
 install(TARGETS backend_mpv
     LIBRARY DESTINATION ${INSTALL_DESTINATION}
     ARCHIVE DESTINATION ${INSTALL_DESTINATION}

diff --git a/featureplugins/CMakeLists.txt b/featureplugins/CMakeLists.txt
index 7dfed400a879ff099aa7d425b280fb9f1925fabf..9861a696806b609e012ee0072df3f549e7346cd2 100644 (file)
--- a/featureplugins/CMakeLists.txt
+++ b/featureplugins/CMakeLists.txt
@@ -2,6 +2,12 @@ project(featureplugins)
 
 set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/featureplugins)
 
+if(WIN32)
+    set(INSTALL_DESTINATION "bin/featureplugins")
+else()
+    set(INSTALL_DESTINATION "lib${LIB_SUFFIX}/aniplayer/featureplugins")
+endif()
+
 if (WITH_FEATURE_LOCALMYLIST)
     add_subdirectory(feature_localmylist)
 endif()

diff --git a/featureplugins/feature_annotations/CMakeLists.txt b/featureplugins/feature_annotations/CMakeLists.txt
index 54056986b23dd32fbd3eb76191b13ce973f94488..8a8d5ca9cca9b5388ca0b8b1eb5b89ea9dc9db60 100644 (file)
--- a/featureplugins/feature_annotations/CMakeLists.txt
+++ b/featureplugins/feature_annotations/CMakeLists.txt
@@ -45,12 +45,6 @@ target_link_libraries(feature_annotations ${feature_annotations_LIBS})
 
 add_definitions(-DFEATURE_ANNOTATIONS_LIBRARY)
 
-if(WIN32)
-    set(INSTALL_DESTINATION "aniplayer/uiplugins")
-else()
-    set(INSTALL_DESTINATION "lib${LIB_SUFFIX}/aniplayer/uiplugins")
-endif()
-
 install(TARGETS feature_annotations
     LIBRARY DESTINATION ${INSTALL_DESTINATION}
     ARCHIVE DESTINATION ${INSTALL_DESTINATION}

diff --git a/featureplugins/feature_annotations/featureannotations.cpp b/featureplugins/feature_annotations/featureannotations.cpp
index 1fb0aa4007d7a0a2fc71fcf8a68c9b4ebe1e60b3..73314fe508d8a4174184398bfefd268ab7aebf93 100644 (file)
--- a/featureplugins/feature_annotations/featureannotations.cpp
+++ b/featureplugins/feature_annotations/featureannotations.cpp
@@ -28,7 +28,7 @@ detection_net_type net;
 }
 
 FeatureAnnoations::FeatureAnnoations(QObject *parent) : QObject{parent} {
-  deserialize("mmod_network.dat") >> net;
+  deserialize("C:/_C/anime_face_recognition/mmod_network.dat") >> net;
 }
 
 FeaturePluginInstance *

diff --git a/featureplugins/feature_localmylist/CMakeLists.txt b/featureplugins/feature_localmylist/CMakeLists.txt
index d706ab81cddb81ee1b80d46e460bd04598a9cab1..aff20389797fb6abe55ed5abc00a44437ca792ca 100644 (file)
--- a/featureplugins/feature_localmylist/CMakeLists.txt
+++ b/featureplugins/feature_localmylist/CMakeLists.txt
@@ -38,12 +38,6 @@ target_link_libraries(feature_localmylist ${feature_localmylist_LIBS})
 
 add_definitions(-DFEATURE_LOCALMYLIST_LIBRARY)
 
-if(WIN32)
-    set(INSTALL_DESTINATION "aniplayer/uiplugins")
-else()
-    set(INSTALL_DESTINATION "lib${LIB_SUFFIX}/aniplayer/uiplugins")
-endif()
-
 install(TARGETS feature_localmylist
     LIBRARY DESTINATION ${INSTALL_DESTINATION}
     ARCHIVE DESTINATION ${INSTALL_DESTINATION}

diff --git a/uiplugins/CMakeLists.txt b/uiplugins/CMakeLists.txt
index c0ae8c0a4a415c8cb33768c7dc79c486d176a17c..3e0205f0e2b03e184ce9c1e828c71cfc637d2961 100644 (file)
--- a/uiplugins/CMakeLists.txt
+++ b/uiplugins/CMakeLists.txt
@@ -2,6 +2,12 @@ project(uiplugins)
 
 set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/uiplugins)
 
+if(WIN32)
+    set(INSTALL_DESTINATION "bin/uiplugins")
+else()
+    set(INSTALL_DESTINATION "lib${LIB_SUFFIX}/aniplayer/uiplugins")
+endif()
+
 if (WITH_DESKTOP_UI)
     add_subdirectory(ui_desktop_qml_default)
 endif()

diff --git a/uiplugins/ui_desktop_qml_default/CMakeLists.txt b/uiplugins/ui_desktop_qml_default/CMakeLists.txt
index e89fe7b179cf0ebc82aa5f43a444949b37d3c8f3..7df7b9a3ff59c261bd7d63b736d088dc29bf98e4 100644 (file)
--- a/uiplugins/ui_desktop_qml_default/CMakeLists.txt
+++ b/uiplugins/ui_desktop_qml_default/CMakeLists.txt
@@ -44,12 +44,6 @@ target_link_libraries(ui_desktop_qml_default ${ui_desktop_qml_default_LIBS})
 
 add_definitions(-DUI_DESKTOP_QML_DEFAULT_LIBRARY)
 
-if(WIN32)
-    set(INSTALL_DESTINATION "aniplayer/uiplugins")
-else()
-    set(INSTALL_DESTINATION "lib${LIB_SUFFIX}/aniplayer/uiplugins")
-endif()
-
 install(TARGETS ui_desktop_qml_default
     LIBRARY DESTINATION ${INSTALL_DESTINATION}
     ARCHIVE DESTINATION ${INSTALL_DESTINATION}