git-svn-id: svn://db.shs.com.ru/libs@866 a8b55f48-bf90-11e4-a774-851b48703e85

2020-03-19 11:31:13 +00:00
parent 27854e9f3f
commit 4af4e914e2
2 changed files with 2 additions and 8 deletions
--- 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()
--- 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()