From 03a06745fc9f3bbe54afd4de95e2b84571dfc6ef Mon Sep 17 00:00:00 2001 From: APTX Date: Fri, 24 Nov 2017 22:34:07 +0900 Subject: [PATCH] Fix installation paths for plugins --- backendplugins/CMakeLists.txt | 6 ++++++ backendplugins/backend_mpv/CMakeLists.txt | 6 ------ featureplugins/CMakeLists.txt | 6 ++++++ featureplugins/feature_annotations/CMakeLists.txt | 6 ------ featureplugins/feature_annotations/featureannotations.cpp | 2 +- featureplugins/feature_localmylist/CMakeLists.txt | 6 ------ uiplugins/CMakeLists.txt | 6 ++++++ uiplugins/ui_desktop_qml_default/CMakeLists.txt | 6 ------ 8 files changed, 19 insertions(+), 25 deletions(-) diff --git a/backendplugins/CMakeLists.txt b/backendplugins/CMakeLists.txt index fd4dd74..71355c0 100644 --- 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 35fb033..70651b1 100644 --- 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 7dfed40..9861a69 100644 --- 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 5405698..8a8d5ca 100644 --- 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 1fb0aa4..73314fe 100644 --- 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 d706ab8..aff2038 100644 --- 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 c0ae8c0..3e0205f 100644 --- 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 e89fe7b..7df7b9a 100644 --- 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} -- 2.52.0