changeset 32:a293cd68d56c

CMake: correctly fix of the regression on windows (rev. 34).
author SokoL_SD
date Fri, 15 May 2009 18:57:36 +0000
parents eb2f212d17fe
children cf8a415f3f32
files generator/CMakeLists.txt
diffstat 1 files changed, 17 insertions(+), 17 deletions(-) [+]
line wrap: on
line diff
--- a/generator/CMakeLists.txt	Fri May 15 18:39:24 2009 +0000
+++ b/generator/CMakeLists.txt	Fri May 15 18:57:36 2009 +0000
@@ -259,26 +259,26 @@
 # endforeach(dgen_impl ${files_for_gen})
 add_custom_target(dgen COMMENT "")
 
-macro(add_sources_for_generating)
+macro(add_sources_for_generating)	
+    set(parameters_list_file ${CMAKE_BINARY_DIR}/CMakeFiles/dgen_parameters)
+    if(${CMAKE_SYSTEM_NAME} STREQUAL Windows)	
+	file(REMOVE ${parameters_list_file})
+	foreach(arg ${ARGN})
+	    file(APPEND ${parameters_list_file} "${arg}\n")
+	endforeach(arg)
+	set(param @${parameters_list_file})
+    elseif(${CMAKE_SYSTEM_NAME} STREQUAL Linux)
+	set(param ${parameters})
+    endif(${CMAKE_SYSTEM_NAME} STREQUAL Windows)
     foreach(dgen_impl ${ARGN})
-	set(parameters ${GEN_OPT}  --qt-include-directory=${QT_INCLUDE_DIR} --output-directory=${CMAKE_BINARY_DIR}
+
+	add_custom_command(OUTPUT ${dgen_impl}
+			    COMMAND ${CMAKE_COMMAND} -E remove -f ${param}
+			    COMMAND "generator"
+			    ARGS ${GEN_OPT}  --qt-include-directory=${QT_INCLUDE_DIR} --output-directory=${CMAKE_BINARY_DIR}
 							--source-directory=${CMAKE_SOURCE_DIR}/generator 
 							qtjambi_masterinclude.h  
-							${CMAKE_BINARY_DIR}/CMakeFiles/build.txt)
-	set(parameters_list_file ${CMAKE_BINARY_DIR}/CMakeFiles/dgen_parameters)
-	if(${CMAKE_SYSTEM_NAME} STREQUAL Windows)	
-	    file(REMOVE ${parameters_list_file})
-	    foreach(arg ${parameters})
-		file(APPEND ${parameters_list_file} "${arg}\n")
-	    endforeach(arg)
-	    set(param @${parameters_list_file})
-	elseif(${CMAKE_SYSTEM_NAME} STREQUAL Linux)
-	    set(param ${parameters})
-	endif(${CMAKE_SYSTEM_NAME} STREQUAL Windows)
-	add_custom_command(OUTPUT ${dgen_impl}
-			    COMMAND ${CMAKE_COMMAND} -E remove -f ${ARGN}
-			    COMMAND "generator"
-			    ARGS ${param}
+							${CMAKE_BINARY_DIR}/CMakeFiles/build.txt
 			    COMMENT "Generating binding..."
 			    DEPENDS  generator ${gen_typesystem} ${gen_sources} 
 			)