From b4d1a7839c98c29995caccea86e4ae4fff94c316 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=91=D1=8B=D1=87=D0=BA=D0=BE=D0=B2=20=D0=90=D0=BD=D0=B4?= =?UTF-8?q?=D1=80=D0=B5=D0=B9?= Date: Tue, 21 Jan 2020 09:21:49 +0000 Subject: [PATCH] install path /usr/local git-svn-id: svn://db.shs.com.ru/libs@712 a8b55f48-bf90-11e4-a774-851b48703e85 --- qad/CMakeLists.txt | 10 +++------- qad/blockview/blockeditor/CMakeLists.txt | 10 +++------- qad/graphic/qpicalculator/CMakeLists.txt | 10 +++------- 3 files changed, 9 insertions(+), 21 deletions(-) diff --git a/qad/CMakeLists.txt b/qad/CMakeLists.txt index 351cfc2..0131bdd 100644 --- a/qad/CMakeLists.txt +++ b/qad/CMakeLists.txt @@ -24,14 +24,10 @@ if (NOT LIBPROJECT) if (WIN32) set(CMAKE_INSTALL_PREFIX ${MINGW_DIR}) else() - if(APPLE) - set(CMAKE_INSTALL_PREFIX /usr/local) + if (DEFINED ANDROID_PLATFORM) + set(CMAKE_INSTALL_PREFIX ${ANDROID_SYSTEM_LIBRARY_PATH}/usr) else() - if (DEFINED ANDROID_PLATFORM) - set(CMAKE_INSTALL_PREFIX ${ANDROID_SYSTEM_LIBRARY_PATH}/usr) - else() - set(CMAKE_INSTALL_PREFIX /usr) - endif() + set(CMAKE_INSTALL_PREFIX /usr/local) endif() endif() message(STATUS "Install ${PROJECT_NAME} to system \"${CMAKE_INSTALL_PREFIX}\"") diff --git a/qad/blockview/blockeditor/CMakeLists.txt b/qad/blockview/blockeditor/CMakeLists.txt index 5a4f907..b003eff 100644 --- a/qad/blockview/blockeditor/CMakeLists.txt +++ b/qad/blockview/blockeditor/CMakeLists.txt @@ -9,14 +9,10 @@ if(LIB) if(WIN32) qt_install(TARGETS ${PROJECT_NAME} DESTINATION ${MINGW_BIN}) else() - if(APPLE) - qt_install(TARGETS ${PROJECT_NAME} DESTINATION /usr/local/bin) + if (DEFINED ANDROID_PLATFORM) + qt_install(TARGETS ${PROJECT_NAME} DESTINATION ${ANDROID_SYSTEM_LIBRARY_PATH}/usr/bin) else() - if (DEFINED ANDROID_PLATFORM) - qt_install(TARGETS ${PROJECT_NAME} DESTINATION ${ANDROID_SYSTEM_LIBRARY_PATH}/usr/bin) - else() - qt_install(TARGETS ${PROJECT_NAME} DESTINATION /usr/bin) - endif() + qt_install(TARGETS ${PROJECT_NAME} DESTINATION /usr/local/bin) endif() endif() #message(STATUS "Install ${PROJECT_NAME} to system \"${CMAKE_INSTALL_PREFIX}\"") diff --git a/qad/graphic/qpicalculator/CMakeLists.txt b/qad/graphic/qpicalculator/CMakeLists.txt index 6cd2148..8fc0ca6 100644 --- a/qad/graphic/qpicalculator/CMakeLists.txt +++ b/qad/graphic/qpicalculator/CMakeLists.txt @@ -9,14 +9,10 @@ if(LIB) if(WIN32) qt_install(TARGETS ${PROJECT_NAME} DESTINATION ${MINGW_BIN}) else() - if(APPLE) - qt_install(TARGETS ${PROJECT_NAME} DESTINATION /usr/local/bin) + if (DEFINED ANDROID_PLATFORM) + qt_install(TARGETS ${PROJECT_NAME} DESTINATION ${ANDROID_SYSTEM_LIBRARY_PATH}/usr/bin) else() - if (DEFINED ANDROID_PLATFORM) - qt_install(TARGETS ${PROJECT_NAME} DESTINATION ${ANDROID_SYSTEM_LIBRARY_PATH}/usr/bin) - else() - qt_install(TARGETS ${PROJECT_NAME} DESTINATION /usr/bin) - endif() + qt_install(TARGETS ${PROJECT_NAME} DESTINATION /usr/local/bin) endif() endif() #message(STATUS "Install ${PROJECT_NAME} to system \"${CMAKE_INSTALL_PREFIX}\"")