diff generator/CMakeLists.txt @ 235:b796329e8c38

We need to start cmake twice. It is necessary for getting a class list from the generator and using this list for building other parts of QtD.
author SokoL_SD
date Sun, 19 Jul 2009 18:09:33 +0000
parents 1db8a1da977a
children fcc0ada121e1
line wrap: on
line diff
--- a/generator/CMakeLists.txt	Sat Jul 18 15:06:12 2009 +0000
+++ b/generator/CMakeLists.txt	Sun Jul 19 18:09:33 2009 +0000
@@ -302,15 +302,11 @@
     if(d_inc_file_found)
 	set(${CMAKE_SOURCE_DIR}/generator/typesystem_${package}-java.java)
     endif(d_inc_file_found)
-endforeach(package ${packages})
+endforeach(package ${all_packages})
 mark_as_advanced(d_inc_file_found)
 set(d_inc_file_found 1)
 	
-foreach(package ${packages})   
-    set(dgen_impl ${CMAKE_BINARY_DIR}/cpp/qt_${package}/qt_${package}.pri) 
-    break(package ${packages}) 
-endforeach(package ${packages})    
-
+set(dgen_impl ${CMAKE_BINARY_DIR}/build/cpp/qt_core/ArrayOps_shell.cpp)
 if(CMAKE_HOST_WIN32)
     set(sep ";")
 else(CMAKE_HOST_WIN32)
@@ -322,22 +318,12 @@
 add_custom_command(OUTPUT ${dgen_impl}
 	COMMAND ${CMAKE_COMMAND} -E remove -f ${dgen_impl}
 	COMMAND "generator"
-	ARGS ${GEN_OPT}  --include-paths=${inc_paths} --output-directory=${CMAKE_BINARY_DIR}
+	ARGS ${GEN_OPT} --qt-include-directory=${QT_INCLUDE_DIR} 
+	    --output-directory=${CMAKE_BINARY_DIR}/build
 	    --source-directory=${CMAKE_SOURCE_DIR}/generator 
 	    qtjambi_masterinclude.h  
 	    ${CMAKE_BINARY_DIR}/CMakeFiles/build.txt
 	COMMENT "Generating binding..."
-	DEPENDS  generator ${gen_sources}
-	)       
-add_custom_target(dgen DEPENDS ${dgen_impl} COMMENT "")
-
-macro(add_sources_for_generating)
-    foreach(source ${ARGN})
-	add_custom_command(OUTPUT "${source}"
-		COMMAND ""
-		ARGS ""
-		DEPENDS ${dgen_impl}
-		COMMENT ""
-		)
-    endforeach(source ${ARGN})
-endmacro(add_sources_for_generating)
\ No newline at end of file
+	DEPENDS ${gen_sources} ${CMAKE_BINARY_DIR}/CMakeFiles/build.txt
+)       
+add_custom_target(dgen ALL DEPENDS ${dgen_impl} COMMENT "")