From aece628030d7fee599704967e55a3321ffc79a82 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 10:09:48 +0000 Subject: [PATCH] change install path to /usr/local git-svn-id: svn://db.shs.com.ru/libs@713 a8b55f48-bf90-11e4-a774-851b48703e85 --- CMakeLists.txt | 14 +++++--------- cd_utils/CMakeLists.txt | 14 +++++--------- kx_utils/CMakeLists.txt | 10 +++------- piqt_utils/piconnedit/CMakeLists.txt | 10 +++------- piqt_utils/pidumper/CMakeLists.txt | 10 +++------- piqt_utils/piintrospector/CMakeLists.txt | 10 +++------- qcd_utils/pult/CMakeLists.txt | 10 +++------- 7 files changed, 25 insertions(+), 53 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index d279658..10fa996 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -64,17 +64,13 @@ if(LIB) set(CMAKE_INSTALL_PREFIX ${MINGW_DIR}) endif() else() - if(APPLE) - set(CMAKE_INSTALL_PREFIX ${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) + if(CMAKE_CROSSCOMPILING) + set(CMAKE_INSTALL_PREFIX ${CMAKE_STAGING_PREFIX}) else() - if(CMAKE_CROSSCOMPILING) - set(CMAKE_INSTALL_PREFIX ${CMAKE_STAGING_PREFIX}) - else() - set(CMAKE_INSTALL_PREFIX ${INSTALL_PREFIX}/usr) - endif() + set(CMAKE_INSTALL_PREFIX ${INSTALL_PREFIX}/usr/local) endif() endif() endif() diff --git a/cd_utils/CMakeLists.txt b/cd_utils/CMakeLists.txt index 01f9881..f6408ce 100644 --- a/cd_utils/CMakeLists.txt +++ b/cd_utils/CMakeLists.txt @@ -38,17 +38,13 @@ if(NOT LIBPROJECT) set(CMAKE_INSTALL_PREFIX ${MINGW_DIR}) endif() else() - if(APPLE) - set(CMAKE_INSTALL_PREFIX ${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) + if(CMAKE_CROSSCOMPILING) + set(CMAKE_INSTALL_PREFIX ${CMAKE_STAGING_PREFIX}) else() - if(CMAKE_CROSSCOMPILING) - set(CMAKE_INSTALL_PREFIX ${CMAKE_STAGING_PREFIX}) - else() - set(CMAKE_INSTALL_PREFIX ${INSTALL_PREFIX}/usr) - endif() + set(CMAKE_INSTALL_PREFIX ${INSTALL_PREFIX}/usr/local) endif() endif() endif() diff --git a/kx_utils/CMakeLists.txt b/kx_utils/CMakeLists.txt index cf3a787..7894d29 100644 --- a/kx_utils/CMakeLists.txt +++ b/kx_utils/CMakeLists.txt @@ -52,14 +52,10 @@ if (LIB) install(TARGETS ${PROJECT_NAME} DESTINATION ${MINGW_LIB}) install(TARGETS ${PROJECT_NAME} DESTINATION ${MINGW_BIN}) 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() install(FILES ${HDRS_UTILS} DESTINATION ${CMAKE_INSTALL_PREFIX}/include) install(TARGETS ${PROJECT_NAME} DESTINATION ${CMAKE_INSTALL_PREFIX}/lib) diff --git a/piqt_utils/piconnedit/CMakeLists.txt b/piqt_utils/piconnedit/CMakeLists.txt index a8c7770..48150b6 100644 --- a/piqt_utils/piconnedit/CMakeLists.txt +++ b/piqt_utils/piconnedit/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/piqt_utils/pidumper/CMakeLists.txt b/piqt_utils/pidumper/CMakeLists.txt index 2cba56e..95cd5df 100644 --- a/piqt_utils/pidumper/CMakeLists.txt +++ b/piqt_utils/pidumper/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/piqt_utils/piintrospector/CMakeLists.txt b/piqt_utils/piintrospector/CMakeLists.txt index db74bc3..6eabc24 100644 --- a/piqt_utils/piintrospector/CMakeLists.txt +++ b/piqt_utils/piintrospector/CMakeLists.txt @@ -11,14 +11,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/qcd_utils/pult/CMakeLists.txt b/qcd_utils/pult/CMakeLists.txt index 230c5a0..f5f40a0 100644 --- a/qcd_utils/pult/CMakeLists.txt +++ b/qcd_utils/pult/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}\"")