From 4af4e914e20d8d9ca5fae469fe4fe764341c70ce 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: Thu, 19 Mar 2020 11:31:13 +0000 Subject: [PATCH] git-svn-id: svn://db.shs.com.ru/libs@866 a8b55f48-bf90-11e4-a774-851b48703e85 --- CMakeLists.txt | 6 +----- qad/CMakeLists.txt | 4 +--- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 745201d..56899ad 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -70,11 +70,7 @@ set(PIP_FOLDERS "." "core" "containers" "thread" "system" "io_devices" "io_utils set(PIP_INCLUDES) if(LIB) - if(WIN32) - if(MINGW) - set(CMAKE_INSTALL_PREFIX ${MINGW_DIR}) - endif() - else() + if(NOT WIN32) if (DEFINED ANDROID_PLATFORM) set(CMAKE_INSTALL_PREFIX ${ANDROID_SYSTEM_LIBRARY_PATH}/usr) else() diff --git a/qad/CMakeLists.txt b/qad/CMakeLists.txt index fb1f52f..d2d872c 100644 --- a/qad/CMakeLists.txt +++ b/qad/CMakeLists.txt @@ -36,9 +36,7 @@ endif() if (NOT LIBPROJECT) if (LIB) - if (WIN32) - set(CMAKE_INSTALL_PREFIX ${MINGW_DIR}) - else() + if (NOT WIN32) if (DEFINED ANDROID_PLATFORM) set(CMAKE_INSTALL_PREFIX ${ANDROID_SYSTEM_LIBRARY_PATH}/usr) else()