Merge pull request #5537 from akallabeth/win_plugin_path
Setting plugin paths for windows install.
This commit is contained in:
commit
a298a3d8d5
@ -961,27 +961,23 @@ endif()
|
||||
|
||||
# Android expects all libraries to be loadable
|
||||
# without paths.
|
||||
if (ANDROID)
|
||||
set(FREERDP_DATA_PATH "share")
|
||||
set(FREERDP_INSTALL_PREFIX ".")
|
||||
set(FREERDP_LIBRARY_PATH ".")
|
||||
set(FREERDP_PLUGIN_PATH ".")
|
||||
set(FREERDP_ADDIN_PATH ".")
|
||||
if (ANDROID OR WIN32)
|
||||
set(FREERDP_DATA_PATH "share")
|
||||
set(FREERDP_INSTALL_PREFIX ".")
|
||||
set(FREERDP_LIBRARY_PATH ".")
|
||||
set(FREERDP_PLUGIN_PATH ".")
|
||||
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}")
|
||||
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}")
|
||||
else()
|
||||
|
||||
set(FREERDP_DATA_PATH "${CMAKE_INSTALL_PREFIX}/share/freerdp${FREERDP_VERSION_MAJOR}")
|
||||
set(FREERDP_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}")
|
||||
set(FREERDP_LIBRARY_PATH "${CMAKE_INSTALL_LIBDIR}")
|
||||
set(FREERDP_PLUGIN_PATH "${CMAKE_INSTALL_LIBDIR}/freerdp${FREERDP_VERSION_MAJOR}")
|
||||
set(FREERDP_ADDIN_PATH "${FREERDP_PLUGIN_PATH}")
|
||||
endif()
|
||||
set(FREERDP_ADDIN_PATH "${FREERDP_PLUGIN_PATH}")
|
||||
|
||||
# Path to put extensions
|
||||
set(FREERDP_EXTENSION_PATH "${CMAKE_INSTALL_FULL_LIBDIR}/freerdp${FREERDP_VERSION_MAJOR}/extensions")
|
||||
|
Loading…
x
Reference in New Issue
Block a user