From 6eb96c27e5fabe2a1855114e87e1d69005c7dc33 Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Tue, 5 Jan 2016 17:21:08 -0800 Subject: [PATCH] use standard PlugIns path, fix for makefiles build --- cmake/macros/SetupHifiPlugin.cmake | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/cmake/macros/SetupHifiPlugin.cmake b/cmake/macros/SetupHifiPlugin.cmake index b9fc4490d7..d8b8c80f9b 100644 --- a/cmake/macros/SetupHifiPlugin.cmake +++ b/cmake/macros/SetupHifiPlugin.cmake @@ -12,12 +12,12 @@ macro(SETUP_HIFI_PLUGIN) set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "Plugins") if (APPLE) - set(PLUGIN_PATH "interface.app/Contents/MacOS/plugins") + set(PLUGIN_PATH "interface.app/Contents/PlugIns") else() set(PLUGIN_PATH "plugins") endif() - IF(${CMAKE_SYSTEM_NAME} MATCHES "Linux") + if (CMAKE_SYSTEM_NAME MATCHES "Linux" OR CMAKE_GENERATOR STREQUAL "Unix Makefiles") set(PLUGIN_FULL_PATH "${CMAKE_BINARY_DIR}/interface/${PLUGIN_PATH}/") else() set(PLUGIN_FULL_PATH "${CMAKE_BINARY_DIR}/interface/$/${PLUGIN_PATH}/") @@ -35,5 +35,4 @@ macro(SETUP_HIFI_PLUGIN) "$" ${PLUGIN_FULL_PATH} ) - endmacro()