git-svn-id: svn://db.shs.com.ru/libs@866 a8b55f48-bf90-11e4-a774-851b48703e85
This commit is contained in:
@@ -70,11 +70,7 @@ set(PIP_FOLDERS "." "core" "containers" "thread" "system" "io_devices" "io_utils
|
|||||||
set(PIP_INCLUDES)
|
set(PIP_INCLUDES)
|
||||||
|
|
||||||
if(LIB)
|
if(LIB)
|
||||||
if(WIN32)
|
if(NOT WIN32)
|
||||||
if(MINGW)
|
|
||||||
set(CMAKE_INSTALL_PREFIX ${MINGW_DIR})
|
|
||||||
endif()
|
|
||||||
else()
|
|
||||||
if (DEFINED ANDROID_PLATFORM)
|
if (DEFINED ANDROID_PLATFORM)
|
||||||
set(CMAKE_INSTALL_PREFIX ${ANDROID_SYSTEM_LIBRARY_PATH}/usr)
|
set(CMAKE_INSTALL_PREFIX ${ANDROID_SYSTEM_LIBRARY_PATH}/usr)
|
||||||
else()
|
else()
|
||||||
|
|||||||
@@ -36,9 +36,7 @@ endif()
|
|||||||
|
|
||||||
if (NOT LIBPROJECT)
|
if (NOT LIBPROJECT)
|
||||||
if (LIB)
|
if (LIB)
|
||||||
if (WIN32)
|
if (NOT WIN32)
|
||||||
set(CMAKE_INSTALL_PREFIX ${MINGW_DIR})
|
|
||||||
else()
|
|
||||||
if (DEFINED ANDROID_PLATFORM)
|
if (DEFINED ANDROID_PLATFORM)
|
||||||
set(CMAKE_INSTALL_PREFIX ${ANDROID_SYSTEM_LIBRARY_PATH}/usr)
|
set(CMAKE_INSTALL_PREFIX ${ANDROID_SYSTEM_LIBRARY_PATH}/usr)
|
||||||
else()
|
else()
|
||||||
|
|||||||
Reference in New Issue
Block a user