Fix plugin paths when building for a mac bundle.

This commit is contained in:
Armin Novak 2019-06-26 09:56:16 +02:00
parent 58c4e639f1
commit abf5916ae5

View File

@ -967,13 +967,21 @@ if (ANDROID)
set(FREERDP_LIBRARY_PATH ".") set(FREERDP_LIBRARY_PATH ".")
set(FREERDP_PLUGIN_PATH ".") set(FREERDP_PLUGIN_PATH ".")
set(FREERDP_ADDIN_PATH ".") set(FREERDP_ADDIN_PATH ".")
else (ANDROID) elseif (MAC_BUNDLE)
set(FREERDP_INSTALL_PREFIX "./")
set(FREERDP_DATA_PATH "${FREERDP_INSTALL_PREFIX}/share/freerdp${FREERDP_VERSION_MAJOR}")
set(FREERDP_LIBRARY_PATH "./")
set(FREERDP_PLUGIN_PATH "${FREERDP_LIBRARY_PATH}/freerdp${FREERDP_VERSION_MAJOR}")
set(FREERDP_ADDIN_PATH "${FREERDP_PLUGIN_PATH}")
else()
set(FREERDP_DATA_PATH "${CMAKE_INSTALL_PREFIX}/share/freerdp${FREERDP_VERSION_MAJOR}") set(FREERDP_DATA_PATH "${CMAKE_INSTALL_PREFIX}/share/freerdp${FREERDP_VERSION_MAJOR}")
set(FREERDP_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}") set(FREERDP_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}")
set(FREERDP_LIBRARY_PATH "${CMAKE_INSTALL_LIBDIR}") set(FREERDP_LIBRARY_PATH "${CMAKE_INSTALL_LIBDIR}")
set(FREERDP_PLUGIN_PATH "${CMAKE_INSTALL_LIBDIR}/freerdp${FREERDP_VERSION_MAJOR}") set(FREERDP_PLUGIN_PATH "${CMAKE_INSTALL_LIBDIR}/freerdp${FREERDP_VERSION_MAJOR}")
set(FREERDP_ADDIN_PATH "${FREERDP_PLUGIN_PATH}") set(FREERDP_ADDIN_PATH "${FREERDP_PLUGIN_PATH}")
endif(ANDROID) endif()
# Path to put extensions # Path to put extensions
set(FREERDP_EXTENSION_PATH "${CMAKE_INSTALL_FULL_LIBDIR}/freerdp${FREERDP_VERSION_MAJOR}/extensions") set(FREERDP_EXTENSION_PATH "${CMAKE_INSTALL_FULL_LIBDIR}/freerdp${FREERDP_VERSION_MAJOR}/extensions")