From d1a031c81147a8489dafd6d67159e33300d75915 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, 1 Dec 2016 12:26:48 +0000 Subject: [PATCH] git-svn-id: svn://db.shs.com.ru/pip@292 12ceb7fc-bf1f-11e4-8940-5bc7170c53b5 --- PIPMacros.cmake | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/PIPMacros.cmake b/PIPMacros.cmake index f5f50982..9a81f00a 100644 --- a/PIPMacros.cmake +++ b/PIPMacros.cmake @@ -27,10 +27,15 @@ macro(pip_code_model RESULT) set(CCM_OUT ${CMAKE_CURRENT_BINARY_DIR}/ccm_${PROJECT_NAME}.cpp) set(${RESULT} ${${RESULT}} ${CCM_OUT}) #message(STATUS "CCM = ${RESULT}") + if(NOT DEFINED PIP_DLL_DIR) + set(PIP_DLL_DIR ${CMAKE_CURRENT_BINARY_DIR}) + endif() add_custom_command(OUTPUT ${CCM_OUT} COMMAND ${PIP_CMG} ARGS -q ${OPTS} -o ${CMAKE_CURRENT_BINARY_DIR}/ccm_${PROJECT_NAME} ${CMG_INCLUDES} ${CMAKE_CURRENT_SOURCE_DIR}/${CCM_SRC} - MAIN_DEPENDENCY ${CCM_SRC} + DEPENDS ${CCM_SRC} + WORKING_DIRECTORY ${PIP_DLL_DIR} + COMMENT "Generating ccm_${PROJECT_NAME}.h, ccm_${PROJECT_NAME}.cpp" VERBATIM) endmacro()