From 659f53470a27759c1393fd3abfc4617db9a62458 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9F=D0=B5=D0=BB=D0=B8=D0=BF=D0=B5=D0=BD=D0=BA=D0=BE=20?= =?UTF-8?q?=D0=98=D0=B2=D0=B0=D0=BD?= Date: Wed, 21 Nov 2018 10:29:44 +0000 Subject: [PATCH] git-svn-id: svn://db.shs.com.ru/pip@663 12ceb7fc-bf1f-11e4-8940-5bc7170c53b5 --- CMakeLists.txt | 23 +++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index eeaa8547..5c403514 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -94,6 +94,11 @@ endif() # Compiler get_filename_component(C_COMPILER "${CMAKE_C_COMPILER}" NAME) +set(INSTALL_PREFIX "") +if(CMAKE_CROSSCOMPILING) + set(INSTALL_PREFIX "${CMAKE_FIND_ROOT_PATH}/") +endif() +#link_directories(${CMAKE_CURRENT_BINARY_DIR}) #message("${C_COMPILER}") @@ -260,10 +265,12 @@ else() endif() endif() endif() +set(PIP_LIBS) foreach(LIB_ ${LIBS_MAIN}) find_library(${LIB_}_FOUND ${LIB_}) if(${LIB_}_FOUND) - list(APPEND CMAKE_REQUIRED_LIBRARIES ${LIB_}) + list(APPEND CMAKE_REQUIRED_LIBRARIES ${${LIB_}_FOUND}) + list(APPEND PIP_LIBS ${${LIB_}_FOUND}) endif() endforeach() list(APPEND LIBS_STATUS ${LIBS_MAIN}) @@ -292,7 +299,7 @@ set(CMAKE_C_FLAGS "${CMAKE_CXX_FLAGS}") include(GenerateExportHeader) generate_export_header(pip) list(APPEND HDRS "${CMAKE_CURRENT_BINARY_DIR}/pip_export.h") -target_link_libraries(pip ${LIBS_MAIN}) +target_link_libraries(pip ${PIP_LIBS}) # Check if USB is supported @@ -301,7 +308,7 @@ if(usb_FOUND) message(STATUS "Building with USB support") add_definitions(-DPIP_USB) add_library(pip_usb SHARED ${CPP_LIB_USB}) - target_link_libraries(pip_usb pip usb) + target_link_libraries(pip_usb pip ${usb_FOUND}) list(APPEND LIBS_STATUS usb) list(APPEND PIP_LIBS_TARGETS pip_usb) else() @@ -315,7 +322,7 @@ if(sodium_FOUND) message(STATUS "Building with crypt support") add_definitions(-DPIP_CRYPT) add_library(pip_crypt SHARED ${CPP_LIB_CRYPT}) - target_link_libraries(pip_crypt pip sodium) + target_link_libraries(pip_crypt pip ${sodium_FOUND}) list(APPEND LIBS_STATUS sodium) list(APPEND PIP_LIBS_TARGETS pip_crypt) else() @@ -423,7 +430,7 @@ list(APPEND PIP_LIBS_TARGETS pip_io_utils) # Test program add_executable(pip_test "main.cpp") -target_link_libraries(pip_test pip pip_crypt) +target_link_libraries(pip_test pip) # Install @@ -448,12 +455,12 @@ if(LIB) endif() else() if(APPLE) - set(CMAKE_INSTALL_PREFIX /usr/local) + set(CMAKE_INSTALL_PREFIX ${INSTALL_PREFIX}/usr/local) else() if (DEFINED ANDROID_PLATFORM) - set(CMAKE_INSTALL_PREFIX ${ANDROID_SYSTEM_LIBRARY_PATH}/usr) + set(CMAKE_INSTALL_PREFIX ${INSTALL_PREFIX}${ANDROID_SYSTEM_LIBRARY_PATH}/usr) else() - set(CMAKE_INSTALL_PREFIX /usr) + set(CMAKE_INSTALL_PREFIX ${INSTALL_PREFIX}/usr) endif() endif() install(FILES ${HDRS} DESTINATION ${CMAKE_INSTALL_PREFIX}/include/pip)