Advertisement
Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- diff --git a/cmake/modules/FindPsiPluginsApi.cmake b/cmake/modules/FindPsiPluginsApi.cmake
- index 74897750..d127a8ad 100644
- --- a/cmake/modules/FindPsiPluginsApi.cmake
- +++ b/cmake/modules/FindPsiPluginsApi.cmake
- @@ -53,9 +53,11 @@ find_path(
- ${ABS_PLUGINS_ROOT_DIR}/cmake/modules
- PATH_SUFFIXES
- src/plugins/cmake/modules
- - share/psi/plugins
- - share/psi-plus/plugins
- - CMAKE_FIND_ROOT_PATH_BOTH
- + if(NOT WIN32)
- + share/psi/plugins
- + share/psi-plus/plugins
- + CMAKE_FIND_ROOT_PATH_BOTH
- + endif()
- )
- find_path(
- @@ -67,9 +69,11 @@ find_path(
- ${ABS_PLUGINS_ROOT_DIR}/include
- PATH_SUFFIXES
- src/plugins/include
- - share/psi/plugins/include
- - share/psi-plus/plugins/include
- - CMAKE_FIND_ROOT_PATH_BOTH
- + if(NOT WIN32)
- + include/psi/plugins
- + include/psi-plus/plugins
- + CMAKE_FIND_ROOT_PATH_BOTH
- + endif()
- )
- include(FindPackageHandleStandardArgs)
- diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
- index ccedc37a..a08a5b55 100644
- --- a/src/CMakeLists.txt
- +++ b/src/CMakeLists.txt
- @@ -447,15 +447,18 @@ if(LINUX)
- install(FILES ${DOC_FILES} DESTINATION "${PROJECT_OUTPUT_DATA_DIR}")
- endif()
- if(INSTALL_PLUGINS_SDK)
- + set(API_OUTPUT_DATA_DIR "${DATA_INSTALL_DIR}/${SHARE_SUFF}")
- + set(API_INCLUDES_DIR "${CMAKE_INSTALL_PREFIX}/include/${SHARE_SUFF}/plugins")
- set(plugins_dir "${PSI_LIBDIR}/plugins")
- - set(data_dir ${PROJECT_OUTPUT_DATA_DIR})
- + set(data_dir "${API_OUTPUT_DATA_DIR}")
- + set(plugins_includes_dir "${API_INCLUDES_DIR}")
- configure_file(${PROJECT_SOURCE_DIR}/src/plugins/pluginsconf.pri.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/pluginsconf.pri @ONLY)
- configure_file(${PROJECT_SOURCE_DIR}/src/plugins/variables.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/variables.cmake @ONLY)
- - install(FILES ${PLUGINS_INCLUDES} DESTINATION ${PROJECT_OUTPUT_DATA_DIR}/plugins/include)
- - install(FILES ${CMAKE_CURRENT_BINARY_DIR}/variables.cmake DESTINATION ${PROJECT_OUTPUT_DATA_DIR}/plugins)
- - install(FILES ${PROJECT_SOURCE_DIR}/src/plugins/plugins.pri DESTINATION ${PROJECT_OUTPUT_DATA_DIR}/plugins)
- - install(FILES ${PROJECT_SOURCE_DIR}/src/plugins/psiplugin.pri DESTINATION ${PROJECT_OUTPUT_DATA_DIR}/plugins)
- - install(FILES ${CMAKE_CURRENT_BINARY_DIR}/pluginsconf.pri DESTINATION ${PROJECT_OUTPUT_DATA_DIR}/plugins)
- + install(FILES ${PLUGINS_INCLUDES} DESTINATION ${API_INCLUDES_DIR})
- + install(FILES ${CMAKE_CURRENT_BINARY_DIR}/variables.cmake DESTINATION ${API_OUTPUT_DATA_DIR}/plugins)
- + install(FILES ${PROJECT_SOURCE_DIR}/src/plugins/plugins.pri DESTINATION ${API_OUTPUT_DATA_DIR}/plugins)
- + install(FILES ${PROJECT_SOURCE_DIR}/src/plugins/psiplugin.pri DESTINATION ${API_OUTPUT_DATA_DIR}/plugins)
- + install(FILES ${CMAKE_CURRENT_BINARY_DIR}/pluginsconf.pri DESTINATION ${API_OUTPUT_DATA_DIR}/plugins)
- install(FILES ${PROJECT_SOURCE_DIR}/cmake/modules/FindPsiPluginsApi.cmake DESTINATION ${DATA_INSTALL_DIR}/cmake/Modules)
- endif()
- endif()
- diff --git a/src/plugins/cmake/modules/FindPsiPluginsApi.cmake b/src/plugins/cmake/modules/FindPsiPluginsApi.cmake
- index d8e39b7a..e2708f1e 100644
- --- a/src/plugins/cmake/modules/FindPsiPluginsApi.cmake
- +++ b/src/plugins/cmake/modules/FindPsiPluginsApi.cmake
- @@ -47,9 +47,11 @@ find_path(
- ${ABS_PLUGINS_ROOT_DIR}/cmake/modules
- PATH_SUFFIXES
- src/plugins/cmake/modules
- - share/psi/plugins
- - share/psi-plus/plugins
- - CMAKE_FIND_ROOT_PATH_BOTH
- + if(NOT WIN32)
- + share/psi/plugins
- + share/psi-plus/plugins
- + CMAKE_FIND_ROOT_PATH_BOTH
- + endif()
- )
- find_path(
- @@ -62,9 +64,11 @@ find_path(
- ${ABS_PLUGINS_ROOT_DIR}/include
- PATH_SUFFIXES
- src/plugins/include
- - share/psi/plugins/include
- - share/psi-plus/plugins/include
- - CMAKE_FIND_ROOT_PATH_BOTH
- + if(NOT WIN32)
- + include/psi/plugins
- + include/psi-plus/plugins
- + CMAKE_FIND_ROOT_PATH_BOTH
- + endif()
- )
- include(FindPackageHandleStandardArgs)
- diff --git a/src/plugins/plugins.pri b/src/plugins/plugins.pri
- index 7b48c995..23062c03 100644
- --- a/src/plugins/plugins.pri
- +++ b/src/plugins/plugins.pri
- @@ -1,44 +1,44 @@
- -INCLUDEPATH += $$PWD/include
- +INCLUDEPATH += $$psi_plugins_include_dir
- HEADERS += \
- - $$PWD/include/psiplugin.h \
- - $$PWD/include/stanzafilter.h \
- - $$PWD/include/stanzasender.h \
- - $$PWD/include/stanzasendinghost.h \
- - $$PWD/include/iqfilter.h \
- - $$PWD/include/iqnamespacefilter.h \
- - $$PWD/include/iqfilteringhost.h \
- - $$PWD/include/eventfilter.h \
- - $$PWD/include/optionaccessor.h \
- - $$PWD/include/optionaccessinghost.h \
- - $$PWD/include/popupaccessor.h \
- - $$PWD/include/popupaccessinghost.h \
- - $$PWD/include/shortcutaccessor.h \
- - $$PWD/include/shortcutaccessinghost.h\
- - $$PWD/include/iconfactoryaccessor.h \
- - $$PWD/include/iconfactoryaccessinghost.h\
- - $$PWD/include/activetabaccessor.h \
- - $$PWD/include/activetabaccessinghost.h \
- - $$PWD/include/applicationinfoaccessor.h \
- - $$PWD/include/applicationinfoaccessinghost.h \
- - $$PWD/include/accountinfoaccessor.h \
- - $$PWD/include/accountinfoaccessinghost.h\
- - $$PWD/include/gctoolbariconaccessor.h \
- - $$PWD/include/toolbariconaccessor.h \
- - $$PWD/include/menuaccessor.h \
- - $$PWD/include/contactstateaccessor.h \
- - $$PWD/include/contactstateaccessinghost.h \
- - $$PWD/include/plugininfoprovider.h \
- - $$PWD/include/psiaccountcontroller.h\
- - $$PWD/include/psiaccountcontrollinghost.h \
- - $$PWD/include/eventcreatinghost.h \
- - $$PWD/include/eventcreator.h \
- - $$PWD/include/contactinfoaccessor.h \
- - $$PWD/include/contactinfoaccessinghost.h \
- - $$PWD/include/soundaccessor.h \
- - $$PWD/include/soundaccessinghost.h \
- - $$PWD/include/chattabaccessor.h \
- - $$PWD/include/webkitaccessor.h \
- - $$PWD/include/webkitaccessinghost.h
- + $$psi_plugins_include_dir/psiplugin.h \
- + $$psi_plugins_include_dir/stanzafilter.h \
- + $$psi_plugins_include_dir/stanzasender.h \
- + $$psi_plugins_include_dir/stanzasendinghost.h \
- + $$psi_plugins_include_dir/iqfilter.h \
- + $$psi_plugins_include_dir/iqnamespacefilter.h \
- + $$psi_plugins_include_dir/iqfilteringhost.h \
- + $$psi_plugins_include_dir/eventfilter.h \
- + $$psi_plugins_include_dir/optionaccessor.h \
- + $$psi_plugins_include_dir/optionaccessinghost.h \
- + $$psi_plugins_include_dir/popupaccessor.h \
- + $$psi_plugins_include_dir/popupaccessinghost.h \
- + $$psi_plugins_include_dir/shortcutaccessor.h \
- + $$psi_plugins_include_dir/shortcutaccessinghost.h\
- + $$psi_plugins_include_dir/iconfactoryaccessor.h \
- + $$psi_plugins_include_dir/iconfactoryaccessinghost.h\
- + $$psi_plugins_include_dir/activetabaccessor.h \
- + $$psi_plugins_include_dir/activetabaccessinghost.h \
- + $$psi_plugins_include_dir/applicationinfoaccessor.h \
- + $$psi_plugins_include_dir/applicationinfoaccessinghost.h \
- + $$psi_plugins_include_dir/accountinfoaccessor.h \
- + $$psi_plugins_include_dir/accountinfoaccessinghost.h\
- + $$psi_plugins_include_dir/gctoolbariconaccessor.h \
- + $$psi_plugins_include_dir/toolbariconaccessor.h \
- + $$psi_plugins_include_dir/menuaccessor.h \
- + $$psi_plugins_include_dir/contactstateaccessor.h \
- + $$psi_plugins_include_dir/contactstateaccessinghost.h \
- + $$psi_plugins_include_dir/plugininfoprovider.h \
- + $$psi_plugins_include_dir/psiaccountcontroller.h\
- + $$psi_plugins_include_dir/psiaccountcontrollinghost.h \
- + $$psi_plugins_include_dir/eventcreatinghost.h \
- + $$psi_plugins_include_dir/eventcreator.h \
- + $$psi_plugins_include_dir/contactinfoaccessor.h \
- + $$psi_plugins_include_dir/contactinfoaccessinghost.h \
- + $$psi_plugins_include_dir/soundaccessor.h \
- + $$psi_plugins_include_dir/soundaccessinghost.h \
- + $$psi_plugins_include_dir/chattabaccessor.h \
- + $$psi_plugins_include_dir/webkitaccessor.h \
- + $$psi_plugins_include_dir/webkitaccessinghost.h
- OTHER_FILES += $$PWD/psiplugin.pri
- diff --git a/src/plugins/pluginsconf.pri b/src/plugins/pluginsconf.pri
- index f2c07c57..9ecc048a 100644
- --- a/src/plugins/pluginsconf.pri
- +++ b/src/plugins/pluginsconf.pri
- @@ -1 +1,2 @@
- psi_plugins_dir = $$(HOME)/.local/share/psi+/plugins
- +psi_plugins_include_dir = $$PWD/include
- diff --git a/src/plugins/pluginsconf.pri.cmake.in b/src/plugins/pluginsconf.pri.cmake.in
- index 79f12f0e..8e6c718c 100644
- --- a/src/plugins/pluginsconf.pri.cmake.in
- +++ b/src/plugins/pluginsconf.pri.cmake.in
- @@ -1,2 +1,3 @@
- psi_plugins_dir="@plugins_dir@"
- psi_data_dir="@data_dir@"
- +psi_plugins_include_dir="@plugins_includes_dir@"
- \ No newline at end of file
- diff --git a/src/plugins/variables.cmake.in b/src/plugins/variables.cmake.in
- index a368950f..d4deda14 100644
- --- a/src/plugins/variables.cmake.in
- +++ b/src/plugins/variables.cmake.in
- @@ -3,5 +3,5 @@ set( PLUGINS_INSTALL_PATH "@plugins_dir@" CACHE STRING "Install path for plugins
- set( PLUGINS_DATA_PATH "@data_dir@/plugins" CACHE STRING "Path to plugins datadir" )
- set( MAIN_PROGRAM_NAME "@SHARE_SUFF@" CACHE STRING "Name of main client" )
- add_definitions( -DQT_PLUGIN )
- -include_directories("${PLUGINS_DATA_PATH}/include")
- +include_directories("@plugins_includes_dir@")
- set(CMAKE_CXX_STANDARD 14)
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement