From f05934521bc5a8d3f4c0a803dea04c7599f84959 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9F=D0=B5=D0=BB=D0=B8=D0=BF=D0=B5=D0=BD=D0=BA=D0=BE=20?= =?UTF-8?q?=D0=98=D0=B2=D0=B0=D0=BD?= Date: Mon, 9 Mar 2020 15:37:49 +0000 Subject: [PATCH] git-svn-id: svn://db.shs.com.ru/pip@938 12ceb7fc-bf1f-11e4-8940-5bc7170c53b5 --- CMakeLists.txt | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 684d9abf..2f32fffb 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -121,7 +121,10 @@ if(LIB) endif() endif() -if ("x${PIP_RC}" STREQUAL "x") +if((CMAKE_CROSSCOMPILING OR (DEFINED ANDROID_PLATFORM)) AND (NOT PIP_CMG)) + set(PIP_CMG "pip_cmg") + set(PIP_RC "pip_rc") +else() set(PIP_CMG "${CMAKE_CURRENT_BINARY_DIR}/utils/code_model_generator/pip_cmg") set(PIP_RC "${CMAKE_CURRENT_BINARY_DIR}/utils/resources_compiler/pip_rc") endif()