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

Setting lib64 preference now.

Browse Source
This commit is contained in:
Armin Novak 2016-06-03 13:02:30 +02:00
parent 20568af6a4
commit de662b9962
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
CMakeLists.txt
View File

@ -96,9 +96,9 @@ if (FREERDP_EXTERNAL_PATH)
endif() endif()
# Allow to search the host machine for git # Allow to search the host machine for git
if(ANDROID OR IOS) if(CMAKE_CROSSCOMPILING)
SET(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM BOTH) SET(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM BOTH)
endif(ANDROID OR IOS) endif(CMAKE_CROSSCOMPILING)
include(GetGitRevisionDescription) include(GetGitRevisionDescription)
git_get_exact_tag(GIT_REVISION --tags --always) git_get_exact_tag(GIT_REVISION --tags --always)
@ -106,9 +106,9 @@ git_get_exact_tag(GIT_REVISION --tags --always)
if (${GIT_REVISION} STREQUAL "n/a") if (${GIT_REVISION} STREQUAL "n/a")
git_rev_parse (GIT_REVISION --short) git_rev_parse (GIT_REVISION --short)
endif() endif()
if(ANDROID OR IOS) if(CMAKE_CROSSCOMPILING)
SET (CMAKE_FIND_ROOT_PATH_MODE_PROGRAM ONLY) SET (CMAKE_FIND_ROOT_PATH_MODE_PROGRAM ONLY)
endif(ANDROID OR IOS) endif(CMAKE_CROSSCOMPILING)
message(STATUS "Git Revision ${GIT_REVISION}") message(STATUS "Git Revision ${GIT_REVISION}")
@ -459,6 +459,8 @@ endif()
if(ANDROID) if(ANDROID)
set(WITH_LIBRARY_VERSIONING "OFF") set(WITH_LIBRARY_VERSIONING "OFF")
set_property( GLOBAL PROPERTY FIND_LIBRARY_USE_LIB64_PATHS ${ANDROID_LIBRARY_USE_LIB64_PATHS} )
if (${ANDROID_ABI} STREQUAL "armeabi") if (${ANDROID_ABI} STREQUAL "armeabi")
set (WITH_NEON OFF) set (WITH_NEON OFF)
endif() endif()