ports/chinese/fcitx/files/patch-cmake__FcitxMacro.cmake
Kurt Jaeger cc30a2c7e1 chinese/fcitx: 4.2.8.6 -> 4.2.9.1
PR:		210782
Submitted by:	Iblis Lin <iblis@hs.ntnu.edu.tw>
Approved by:	lichray@gmail.com (maintainer)
2016-07-09 11:37:36 +00:00

51 lines
2.4 KiB
CMake

--- cmake/FcitxMacro.cmake.orig 2015-12-12 08:02:09 UTC
+++ cmake/FcitxMacro.cmake
@@ -366,10 +366,10 @@ function(fcitx_add_addon_full short_name
add_custom_target("${target_name}" ALL)
__fcitx_addon_config_file("${target_name}" "${FCITX_ADDON_CONF_SRC}"
- "${FCITX4_ADDON_CONFIG_INSTALL_DIR}")
+ "${FCITX4_ADDON_CONFIG_INSTALL_DESTDIR}")
foreach(im_config ${FCITX_ADDON_IM_CONFIG})
__fcitx_addon_config_file("${target_name}" "${im_config}"
- "${FCITX4_INPUTMETHOD_CONFIG_INSTALL_DIR}")
+ "${FCITX4_INPUTMETHOD_CONFIG_INSTALL_DESTDIR}")
endforeach()
__fcitx_add_addon_lib("${FCITX_ADDON_LIB_NAME}" ${FCITX_ADDON_SOURCES})
if(FCITX_ADDON_LINK_LIBS)
@@ -393,7 +393,7 @@ function(__fcitx_add_addon_lib lib_name)
set_target_properties("${lib_name}" PROPERTIES PREFIX ""
COMPILE_FLAGS "-fvisibility=hidden")
add_dependencies("${lib_name}" fcitx-scan-addons.target)
- install(TARGETS "${lib_name}" DESTINATION "${FCITX4_ADDON_INSTALL_DIR}")
+ install(TARGETS "${lib_name}" DESTINATION "${FCITX4_ADDON_INSTALL_DESTDIR}")
endfunction()
function(__fcitx_install_addon_desc target_name)
@@ -402,7 +402,7 @@ function(__fcitx_install_addon_desc targ
add_custom_target("${desc_target}" DEPENDS ${descs})
add_dependencies("${target_name}" "${desc_target}")
install(FILES ${descs}
- DESTINATION "${FCITX4_CONFIGDESC_INSTALL_DIR}")
+ DESTINATION "${FCITX4_CONFIGDESC_INSTALL_DESTDIR}")
endfunction()
# Add additional config-desc files, the file will be added to extracte
@@ -897,7 +897,7 @@ MACRO(FCITX_ADD_ADDON_CONF_FILE conffile
__FCITX_CONF_FILE_GET_UNIQUE_TARGET_NAME(fcitx_addon_conf targetname)
add_custom_target(${targetname} ALL DEPENDS ${conffilename})
install(FILES "${CMAKE_CURRENT_BINARY_DIR}/${conffilename}"
- DESTINATION "${FCITX4_ADDON_CONFIG_INSTALL_DIR}")
+ DESTINATION "${FCITX4_ADDON_CONFIG_INSTALL_DESTDIR}")
ENDMACRO(FCITX_ADD_ADDON_CONF_FILE conffilename)
MACRO(FCITX_ADD_INPUTMETHOD_CONF_FILE conffilename)
@@ -906,7 +906,7 @@ MACRO(FCITX_ADD_INPUTMETHOD_CONF_FILE co
__FCITX_CONF_FILE_GET_UNIQUE_TARGET_NAME(fcitx_inputmethod_conf targetname)
add_custom_target(${targetname} ALL DEPENDS ${conffilename})
install(FILES "${CMAKE_CURRENT_BINARY_DIR}/${conffilename}"
- DESTINATION "${FCITX4_INPUTMETHOD_CONFIG_INSTALL_DIR}")
+ DESTINATION "${FCITX4_INPUTMETHOD_CONFIG_INSTALL_DESTDIR}")
ENDMACRO()
MACRO(FCITX_ADD_CONFIGDESC_FILE)