diff options
| author | Kozlov Dmitry <xeb@mail.ru> | 2012-12-26 02:15:05 +0400 |
|---|---|---|
| committer | Kozlov Dmitry <xeb@mail.ru> | 2013-01-25 00:15:23 +0400 |
| commit | bea22e396766ff09ca43e6ddc143b0f1dd6c08bd (patch) | |
| tree | e00f4cbc6ed0542fef8f3d8201a6b00854b437ec /accel-pppd/ctrl | |
| parent | afdce0b1537264067f7cbb2b0adb63b20dc5d9e7 (diff) | |
| download | accel-ppp-bea22e396766ff09ca43e6ddc143b0f1dd6c08bd.tar.gz accel-ppp-bea22e396766ff09ca43e6ddc143b0f1dd6c08bd.zip | |
cmake: use CMAKE_FIND_ROOT_PATH and LIB_SUFFIX
Diffstat (limited to 'accel-pppd/ctrl')
| -rw-r--r-- | accel-pppd/ctrl/l2tp/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | accel-pppd/ctrl/pppoe/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | accel-pppd/ctrl/pptp/CMakeLists.txt | 2 |
3 files changed, 3 insertions, 7 deletions
diff --git a/accel-pppd/ctrl/l2tp/CMakeLists.txt b/accel-pppd/ctrl/l2tp/CMakeLists.txt index b2952899..66dd3fc6 100644 --- a/accel-pppd/ctrl/l2tp/CMakeLists.txt +++ b/accel-pppd/ctrl/l2tp/CMakeLists.txt @@ -10,7 +10,7 @@ ADD_LIBRARY(l2tp SHARED ) #TARGET_LINK_LIBRARIES(l2tp nl nl-genl) -INSTALL(TARGETS l2tp LIBRARY DESTINATION lib/accel-ppp) +INSTALL(TARGETS l2tp LIBRARY DESTINATION lib${LIB_SUFFIX}/accel-ppp) FILE(GLOB dict "${CMAKE_CURRENT_SOURCE_DIR}/dict/*") INSTALL(FILES ${dict} DESTINATION share/accel-ppp/l2tp) diff --git a/accel-pppd/ctrl/pppoe/CMakeLists.txt b/accel-pppd/ctrl/pppoe/CMakeLists.txt index a38cfb2c..fad9efd0 100644 --- a/accel-pppd/ctrl/pppoe/CMakeLists.txt +++ b/accel-pppd/ctrl/pppoe/CMakeLists.txt @@ -13,9 +13,5 @@ ENDIF(RADIUS) ADD_LIBRARY(pppoe SHARED ${sources}) TARGET_LINK_LIBRARIES(pppoe ${crypto_lib}) -#set_property(TARGET pppoe PROPERTY CMAKE_SKIP_BUILD_RPATH FALSE) -#set_property(TARGET pppoe PROPERTY CMAKE_BUILD_WITH_INSTALL_RPATH FALSE) -#set_property(TARGET pppoe PROPERTY INSTALL_RPATH_USE_LINK_PATH FALSE) -#set_property(TARGET pppoe PROPERTY INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib/accel-ppp) -INSTALL(TARGETS pppoe LIBRARY DESTINATION lib/accel-ppp) +INSTALL(TARGETS pppoe LIBRARY DESTINATION lib${LIB_SUFFIX}/accel-ppp) diff --git a/accel-pppd/ctrl/pptp/CMakeLists.txt b/accel-pppd/ctrl/pptp/CMakeLists.txt index 3199e7f1..aa011d1a 100644 --- a/accel-pppd/ctrl/pptp/CMakeLists.txt +++ b/accel-pppd/ctrl/pptp/CMakeLists.txt @@ -2,4 +2,4 @@ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) ADD_LIBRARY(pptp SHARED pptp.c) -INSTALL(TARGETS pptp LIBRARY DESTINATION lib/accel-ppp ) +INSTALL(TARGETS pptp LIBRARY DESTINATION lib${LIB_SUFFIX}/accel-ppp ) |