From 2a42925d9ddb14cdcef8116fa3b341acfca9b537 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: Mon, 9 Mar 2020 20:08:15 +0000 Subject: [PATCH] git-svn-id: svn://db.shs.com.ru/pip@942 12ceb7fc-bf1f-11e4-8940-5bc7170c53b5 --- CMakeLists.txt | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 1ad3bc4d..cb1a92d3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -121,12 +121,14 @@ if(LIB) endif() endif() -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") +if (NOT DEFINED PIP_CMG) + if (CMAKE_CROSSCOMPILING OR (DEFINED ANDROID_PLATFORM)) + 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() endif()