mirrors/FreeRDP
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #5583 from akallabeth/mac_bundle_paths

Browse Source 
mac os bundles should not put libraries/addins in a subfolder.
This commit is contained in:
Martin Fleisz 2019-09-10 12:31:11 +02:00 committed by GitHub
commit 24786d8b4d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
CMakeLists.txt
View File

@ -961,16 +961,11 @@ endif()
# Android expects all libraries to be loadable
# without paths.
if (ANDROID OR WIN32)
if (ANDROID OR WIN32 OR MAC_BUNDLE)
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}")
else()
set(FREERDP_DATA_PATH "${CMAKE_INSTALL_PREFIX}/share/freerdp${FREERDP_VERSION_MAJOR}")
set(FREERDP_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}")