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

2020-03-09 09:32:38 +00:00
parent 81226c7cae
commit 7458e725de
1 changed files with 1 additions and 2 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -28,9 +28,8 @@ else()
 			link_directories(/usr/local/lib)
 		endif()
 	else()
-		set(CMAKE_INSTALL_RPATH "\$ORIGIN/lib")
+		set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_RPATH}:\$ORIGIN/lib")
 	endif()
-	set(CMAKE_INSTALL_RPATH_USE_LINK_PATH 1)
 endif()
 if (DEFINED ANDROID_PLATFORM)
 	include_directories(${ANDROID_SYSTEM_LIBRARY_PATH}/usr/include)