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..506b6f7f 100644
- --- a/cmake/modules/FindPsiPluginsApi.cmake
- +++ b/cmake/modules/FindPsiPluginsApi.cmake
- @@ -32,30 +32,28 @@ if(PsiPluginsApi_INCLUDE_DIR)
- endif()
- if(PLUGINS_ROOT_DIR)
- - get_filename_component(
- - ABS_PLUGINS_ROOT_DIR
- - "${PLUGINS_ROOT_DIR}"
- - ABSOLUTE
- - )
- + get_filename_component(ABS_PLUGINS_ROOT_DIR "${PLUGINS_ROOT_DIR}" ABSOLUTE)
- +endif()
- +get_filename_component(ABS_CURRENT_DIR "${CMAKE_CURRENT_LIST_DIR}/../.." ABSOLUTE)
- +get_filename_component(ABS_PARENT_DIR "${ABS_CURRENT_DIR}/.." ABSOLUTE)
- +
- +if(CMAKE_CROSSCOMPILING OR CMAKE_CROSS_COMPILING OR (EXISTS "${ABS_PLUGINS_ROOT_DIR}/include"))
- + set(SEARCH_FLAG NO_CMAKE_FIND_ROOT_PATH)
- endif()
- -get_filename_component(
- - ABS_CURRENT_DIR
- - "${CMAKE_CURRENT_LIST_DIR}/../.."
- - ABSOLUTE
- -)
- find_path(
- PsiPluginsApi_DIR
- NAMES
- "variables.cmake"
- PATHS
- - ${ABS_CURRENT_DIR}
- ${ABS_PLUGINS_ROOT_DIR}/cmake/modules
- + ${ABS_CURRENT_DIR}
- + ${ABS_PARENT_DIR}/psi
- PATH_SUFFIXES
- src/plugins/cmake/modules
- share/psi/plugins
- share/psi-plus/plugins
- - CMAKE_FIND_ROOT_PATH_BOTH
- + ${SEARCH_FLAG}
- )
- find_path(
- @@ -63,13 +61,14 @@ find_path(
- NAMES
- "applicationinfoaccessor.h"
- PATHS
- - ${ABS_CURRENT_DIR}
- ${ABS_PLUGINS_ROOT_DIR}/include
- + ${ABS_CURRENT_DIR}
- + ${ABS_PARENT_DIR}/psi
- PATH_SUFFIXES
- src/plugins/include
- - share/psi/plugins/include
- - share/psi-plus/plugins/include
- - CMAKE_FIND_ROOT_PATH_BOTH
- + include/psi/plugins
- + include/psi-plus/plugins
- + ${SEARCH_FLAG}
- )
- include(FindPackageHandleStandardArgs)
- diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
- index ccedc37a..9d758f7b 100644
- --- a/src/CMakeLists.txt
- +++ b/src/CMakeLists.txt
- @@ -447,15 +447,20 @@ 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(plugins_dir_sfx "lib${LIB_SUFFIX}/${SHARE_SUFF}/plugins")
- + set(data_dir "${API_OUTPUT_DATA_DIR}")
- + set(data_dir_sfx "share/${SHARE_SUFF}/plugins")
- + 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/CMakeLists.txt b/src/plugins/CMakeLists.txt
- index 9ccf6c57..8843ce0c 100644
- --- a/src/plugins/CMakeLists.txt
- +++ b/src/plugins/CMakeLists.txt
- @@ -17,6 +17,8 @@ set( CMAKE_MODULE_PATH
- find_package(PsiPluginsApi QUIET)
- if(PsiPluginsApi_DIR)
- include(${PsiPluginsApi_DIR}/variables.cmake)
- + message(STATUS "PsiPluginsApi_DIR: ${PsiPluginsApi_DIR}")
- + message(STATUS "PsiPluginsApi_INCLUDE_DIR: ${PsiPluginsApi_INCLUDE_DIR}")
- endif()
- if(PROJECT_NAME AND MAIN_PROGRAM_NAME)
- diff --git a/src/plugins/cmake/modules/FindPsiPluginsApi.cmake b/src/plugins/cmake/modules/FindPsiPluginsApi.cmake
- index d8e39b7a..506b6f7f 100644
- --- a/src/plugins/cmake/modules/FindPsiPluginsApi.cmake
- +++ b/src/plugins/cmake/modules/FindPsiPluginsApi.cmake
- @@ -37,19 +37,23 @@ endif()
- get_filename_component(ABS_CURRENT_DIR "${CMAKE_CURRENT_LIST_DIR}/../.." ABSOLUTE)
- get_filename_component(ABS_PARENT_DIR "${ABS_CURRENT_DIR}/.." ABSOLUTE)
- +if(CMAKE_CROSSCOMPILING OR CMAKE_CROSS_COMPILING OR (EXISTS "${ABS_PLUGINS_ROOT_DIR}/include"))
- + set(SEARCH_FLAG NO_CMAKE_FIND_ROOT_PATH)
- +endif()
- +
- find_path(
- PsiPluginsApi_DIR
- NAMES
- "variables.cmake"
- PATHS
- + ${ABS_PLUGINS_ROOT_DIR}/cmake/modules
- ${ABS_CURRENT_DIR}
- ${ABS_PARENT_DIR}/psi
- - ${ABS_PLUGINS_ROOT_DIR}/cmake/modules
- PATH_SUFFIXES
- src/plugins/cmake/modules
- share/psi/plugins
- share/psi-plus/plugins
- - CMAKE_FIND_ROOT_PATH_BOTH
- + ${SEARCH_FLAG}
- )
- find_path(
- @@ -57,14 +61,14 @@ find_path(
- NAMES
- "applicationinfoaccessor.h"
- PATHS
- + ${ABS_PLUGINS_ROOT_DIR}/include
- ${ABS_CURRENT_DIR}
- ${ABS_PARENT_DIR}/psi
- - ${ABS_PLUGINS_ROOT_DIR}/include
- PATH_SUFFIXES
- src/plugins/include
- - share/psi/plugins/include
- - share/psi-plus/plugins/include
- - CMAKE_FIND_ROOT_PATH_BOTH
- + include/psi/plugins
- + include/psi-plus/plugins
- + ${SEARCH_FLAG}
- )
- include(FindPackageHandleStandardArgs)
- diff --git a/src/plugins/variables.cmake.in b/src/plugins/variables.cmake.in
- index a368950f..1924598c 100644
- --- a/src/plugins/variables.cmake.in
- +++ b/src/plugins/variables.cmake.in
- @@ -1,7 +1,7 @@
- set( LIB_SUFFIX "" CACHE STRING "Define suffix of directory name (32/64)" )
- -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( PLUGINS_INSTALL_PATH "${CMAKE_INSTALL_PREFIX}/@plugins_dir_sfx@" CACHE STRING "Install path for plugins" )
- +set( PLUGINS_DATA_PATH "${CMAKE_INSTALL_PREFIX}/@data_dir_sfx@" 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