From 27daa6db8f21e528288d8667ae953d1c5e005a94 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?= <andrey@signalmodelling.ru>
Date: Wed, 30 Nov 2016 16:18:16 +0000
Subject: [PATCH] git-svn-id: svn://db.shs.com.ru/pip@289
 12ceb7fc-bf1f-11e4-8940-5bc7170c53b5

---
 PIPMacros2.cmake | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/PIPMacros2.cmake b/PIPMacros2.cmake
index a600856f..a51fb633 100644
--- a/PIPMacros2.cmake
+++ b/PIPMacros2.cmake
@@ -3,9 +3,9 @@ macro (PIP_EXTRACT_OPTIONS _pip_files _pip_options)
   set(${_pip_options})
   set(_PIP_DOING_OPTIONS FALSE)
   foreach(_currentArg ${ARGN})
-    if ("x${_currentArg}" STREQUAL "xOPTIONS")
+    if("x${_currentArg}" STREQUAL "xOPTIONS")
       set(_PIP_DOING_OPTIONS TRUE)
-    else ()
+    else()
       if(_PIP_DOING_OPTIONS)
         list(APPEND ${_pip_options} "${_currentArg}")
       else()
@@ -19,22 +19,26 @@ macro (pip_code_model RESULT)
 	PIP_EXTRACT_OPTIONS(CCM_SRC OPTS ${ARGN})
 	set(CCM_OPTS)
 	foreach (it ${OPTS})
-		set(CCM_OPTS "${CCM_OPTS} ${it}")
+		if(CCM_OPTS)
+			set(CCM_OPTS "${CCM_OPTS} ${it}")
+		else()
+			set(CCM_OPTS "${it}")
+		endif()
 	endforeach()
 	message(STATUS "src = ${CCM_SRC}")
 	#message(STATUS "result = ${RESULT}")
 	message(STATUS "options = ${CCM_OPTS}")
 	set(CCM_OUT ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}_ccm.cpp)
 	set(${RESULT} ${${RESULT}} ${CCM_OUT})
-	message(STATUS "CCM = ${CCM_OUT}")
+	message(STATUS "CCM = ${RESULT}")
 	add_custom_command(OUTPUT ${CCM_OUT}
                        COMMAND ${PIP_CMG}
-					   ARGS -qP ${CCM_OPTS} -o ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}_ccm -I${PIP_INCLUDES} ${CMAKE_CURRENT_SOURCE_DIR}/${CCM_SRC}
-                       DEPENDS ${CCM_SRC}
-                       VERBATIM)
+					   ARGS -P ${CCM_OPTS} -o ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}_ccm -I${PIP_INCLUDES} ${CMAKE_CURRENT_SOURCE_DIR}/${CCM_SRC}
+                       MAIN_DEPENDENCY ${CCM_SRC})
+                       #VERBATIM)
 		#message(STATUS "Creating code model based on \"${CCM_SRC}\", please wait ... ")
 		#message(STATUS "exec \"-qP ${CCM_OPTS} -o ${PROJECT_NAME}_ccm -I${PIP_INCLUDES} ${CCM_SRC}\"")
-	message(STATUS "exec ${PIP_CMG} -qP ${CCM_OPTS} -o ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}_ccm -I${PIP_INCLUDES} ${CMAKE_CURRENT_SOURCE_DIR}/${CCM_SRC}")
+	message(STATUS "exec ${PIP_CMG} -P ${CCM_OPTS} -o ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}_ccm -I${PIP_INCLUDES} ${CMAKE_CURRENT_SOURCE_DIR}/${CCM_SRC}")
 		#execute_process(OUTPUT_VARIABLE CMG_OUT COMMAND ${PIP_CMG} -qP ${CCM_OPTS} -o ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}_ccm -I${PIP_INCLUDES} ${CMAKE_CURRENT_SOURCE_DIR}/${CCM_SRC})
 		#message(STATUS "Creating code model done, to use it include \"${PROJECT_NAME}_ccm.h\"")
 	#message(STATUS ${CMG_OUT})