From 8841ea8a6f77b02350abc881448402a8479314b8 Mon Sep 17 00:00:00 2001 From: BtbN Date: Fri, 26 Sep 2014 23:06:33 -0700 Subject: [PATCH] cmake: Export plugin data destination --- cmake/Modules/ObsHelpers.cmake | 2 ++ libobs/LibObsConfig.cmake.in | 3 +++ 2 files changed, 5 insertions(+) diff --git a/cmake/Modules/ObsHelpers.cmake b/cmake/Modules/ObsHelpers.cmake index a3a86fe55..c8f847267 100644 --- a/cmake/Modules/ObsHelpers.cmake +++ b/cmake/Modules/ObsHelpers.cmake @@ -282,6 +282,7 @@ function(export_obs_core target exportname) set(CONF_PLUGIN_DEST "${CMAKE_BINARY_DIR}/rundir/${CMAKE_BUILD_TYPE}/obs-plugins/${_lib_suffix}bit") set(CONF_PLUGIN_DEST32 "${CMAKE_BINARY_DIR}/rundir/${CMAKE_BUILD_TYPE}/obs-plugins/32bit") set(CONF_PLUGIN_DEST64 "${CMAKE_BINARY_DIR}/rundir/${CMAKE_BUILD_TYPE}/obs-plugins/64bit") + set(CONF_PLUGIN_DATA_DEST "${CMAKE_BINARY_DIR}/rundir/${CMAKE_BUILD_TYPE}/data/obs-plugins") configure_file("${exportname}Config.cmake.in" "${CMAKE_CURRENT_BINARY_DIR}/${exportname}Config.cmake" @ONLY) file(RELATIVE_PATH _pdir "${CMAKE_INSTALL_PREFIX}/${OBS_CMAKE_DESTINATION}/${exportname}" "${CMAKE_INSTALL_PREFIX}") @@ -289,6 +290,7 @@ function(export_obs_core target exportname) set(CONF_PLUGIN_DEST "\${CMAKE_CURRENT_LIST_DIR}/${_pdir}${OBS_PLUGIN_DESTINATION}") set(CONF_PLUGIN_DEST32 "\${CMAKE_CURRENT_LIST_DIR}/${_pdir}${OBS_PLUGIN32_DESTINATION}") set(CONF_PLUGIN_DEST64 "\${CMAKE_CURRENT_LIST_DIR}/${_pdir}${OBS_PLUGIN64_DESTINATION}") + set(CONF_PLUGIN_DATA_DEST "\${CMAKE_CURRENT_LIST_DIR}/${_pdir}${OBS_DATA_DESTINATION}/obs-plugins") configure_file("${exportname}Config.cmake.in" "${CMAKE_CURRENT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/${exportname}Config.cmake" @ONLY) set(_pdir) diff --git a/libobs/LibObsConfig.cmake.in b/libobs/LibObsConfig.cmake.in index 1ff6c9afa..c9f47a1ff 100644 --- a/libobs/LibObsConfig.cmake.in +++ b/libobs/LibObsConfig.cmake.in @@ -3,17 +3,20 @@ # LIBOBS_INCLUDE_DIRS # LIBOBS_LIBRARIES # LIBOBS_PLUGIN_DESTINATION{,32,64} +# LIBOBS_PLUGIN_DATA_DESTINATION set(LIBOBS_PLUGIN_DESTINATION "@CONF_PLUGIN_DEST@") set(LIBOBS_PLUGIN_DESTINATION32 "@CONF_PLUGIN_DEST32@") set(LIBOBS_PLUGIN_DESTINATION64 "@CONF_PLUGIN_DEST64@") set(LIBOBS_INCLUDE_DIRS "@CONF_INCLUDE_DIRS@") +set(LIBOBS_PLUGIN_DATA_DESTINATION "@CONF_PLUGIN_DATA_DEST@") # Cleanup possible relative paths get_filename_component(LIBOBS_PLUGIN_DESTINATION "${LIBOBS_PLUGIN_DESTINATION}" ABSOLUTE) get_filename_component(LIBOBS_PLUGIN_DESTINATION32 "${LIBOBS_PLUGIN_DESTINATION32}" ABSOLUTE) get_filename_component(LIBOBS_PLUGIN_DESTINATION64 "${LIBOBS_PLUGIN_DESTINATION64}" ABSOLUTE) get_filename_component(LIBOBS_INCLUDE_DIRS "${LIBOBS_INCLUDE_DIRS}" ABSOLUTE) +get_filename_component(LIBOBS_PLUGIN_DATA_DESTINATION "${LIBOBS_PLUGIN_DATA_DESTINATION}" ABSOLUTE) if(NOT TARGET libobs) include("${CMAKE_CURRENT_LIST_DIR}/LibObsTarget.cmake")