Merge pull request #6658 from AndrewMeadows/linux-input-plugins

correct input plugin load path on linux
This commit is contained in:
Seth Alves 2015-12-15 18:39:27 -08:00
commit 13a1eec48c

View file

@ -10,24 +10,30 @@ macro(SETUP_HIFI_PLUGIN)
setup_hifi_library(${ARGV}) setup_hifi_library(${ARGV})
add_dependencies(interface ${TARGET_NAME}) add_dependencies(interface ${TARGET_NAME})
set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "Plugins") set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "Plugins")
if (APPLE) if (APPLE)
set(PLUGIN_PATH "interface.app/Contents/MacOS/plugins") set(PLUGIN_PATH "interface.app/Contents/MacOS/plugins")
else() else()
set(PLUGIN_PATH "plugins") set(PLUGIN_PATH "plugins")
endif() endif()
IF(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
set(PLUGIN_FULL_PATH "${CMAKE_BINARY_DIR}/interface/${PLUGIN_PATH}/")
else()
set(PLUGIN_FULL_PATH "${CMAKE_BINARY_DIR}/interface/$<CONFIGURATION>/${PLUGIN_PATH}/")
endif()
# create the destination for the plugin binaries # create the destination for the plugin binaries
add_custom_command( add_custom_command(
TARGET ${TARGET_NAME} POST_BUILD TARGET ${TARGET_NAME} POST_BUILD
COMMAND "${CMAKE_COMMAND}" -E make_directory COMMAND "${CMAKE_COMMAND}" -E make_directory
"${CMAKE_BINARY_DIR}/interface/$<CONFIGURATION>/${PLUGIN_PATH}/" ${PLUGIN_FULL_PATH}
) )
add_custom_command(TARGET ${DIR} POST_BUILD add_custom_command(TARGET ${DIR} POST_BUILD
COMMAND "${CMAKE_COMMAND}" -E copy COMMAND "${CMAKE_COMMAND}" -E copy
"$<TARGET_FILE:${TARGET_NAME}>" "$<TARGET_FILE:${TARGET_NAME}>"
"${CMAKE_BINARY_DIR}/interface/$<CONFIGURATION>/${PLUGIN_PATH}/" ${PLUGIN_FULL_PATH}
) )
endmacro() endmacro()