git-svn-id: svn://db.shs.com.ru/libs@755 a8b55f48-bf90-11e4-a774-851b48703e85

This commit is contained in:
2020-03-09 09:32:38 +00:00
parent 81226c7cae
commit 7458e725de

View File

@@ -28,9 +28,8 @@ else()
link_directories(/usr/local/lib) link_directories(/usr/local/lib)
endif() endif()
else() else()
set(CMAKE_INSTALL_RPATH "\$ORIGIN/lib") set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_RPATH}:\$ORIGIN/lib")
endif() endif()
set(CMAKE_INSTALL_RPATH_USE_LINK_PATH 1)
endif() endif()
if (DEFINED ANDROID_PLATFORM) if (DEFINED ANDROID_PLATFORM)
include_directories(${ANDROID_SYSTEM_LIBRARY_PATH}/usr/include) include_directories(${ANDROID_SYSTEM_LIBRARY_PATH}/usr/include)