Mercurial > projects > qtd

changeset 28:10baf869635a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
CMake: QtD build with cmake again, but some functionality from previews revision are disabled.
author SokoL_SD
date Fri, 15 May 2009 17:30:48 +0000
parents a9626891eca6
children 42d3aefe7d1f
files CMakeLists.txt generator/CMakeLists.txt
diffstat 2 files changed, 35 insertions(+), 31 deletions(-) [+]
line wrap: on
line diff
--- a/CMakeLists.txt	Fri May 15 16:42:02 2009 +0000
+++ b/CMakeLists.txt	Fri May 15 17:30:48 2009 +0000
@@ -483,6 +483,15 @@
 	endif(${CMAKE_SYSTEM_NAME} STREQUAL Windows) 
 	install(FILES ${CMAKE_BINARY_DIR}/${lib} DESTINATION lib)
 
+	## Dependences.
+	add_custom_target(${package} DEPENDS ${lib})
+	foreach(depend ${required})
+	    string(TOLOWER ${depend} depend)
+	    add_dependencies(cpp_${package} cpp_${depend})
+	    add_dependencies(${package} ${depend})
+	endforeach(depend ${required})
+	add_dependencies(allpackages ${package})
+
 	## Paths for QtD libs. Needed by examples.
 	if(${CMAKE_SYSTEM_NAME} STREQUAL Windows AND D_IS_MARS)
 	    set(libs_path ${CMAKE_BINARY_DIR}/lib/qtd${package}.lib)
@@ -541,13 +550,6 @@
 ## Dependences.
 foreach(package ${packages})
     add_dependencies(cpp_${package} dgen)
-    add_custom_target(${package} DEPENDS ${lib})
-    foreach(depend ${required})
-	string(TOLOWER ${depend} depend)
-	add_dependencies(cpp_${package} cpp_${depend})
-	add_dependencies(${package} ${depend})
-    endforeach(depend ${required})
-    add_dependencies(allpackages ${package})
 endforeach(package ${packages})
 
 add_subdirectory(generator)
--- a/generator/CMakeLists.txt	Fri May 15 16:42:02 2009 +0000
+++ b/generator/CMakeLists.txt	Fri May 15 17:30:48 2009 +0000
@@ -233,16 +233,10 @@
 endmacro(add_dgen_target target package required)
 
 foreach(pack ${packages})   
-    set(dgen_impl ${CMAKE_BINARY_DIR}/cpp/qt_${pack}/qt_${pack}.pri) 
-    break(pack ${packages})  
-endforeach(pack ${packages})
-
-foreach(pack ${packages})   
     set(gen_typesystem ${gen_typesystem} ${CMAKE_SOURCE_DIR}/generator/typesystem_${pack}.xml)
     set(gen_sources ${gen_sources} ${CMAKE_SOURCE_DIR}/generator/typesystem_${pack}-java.java)
 endforeach(pack ${packages})
 
-
 set(dgen_build_conf ${CMAKE_BINARY_DIR}/CMakeFiles/built.txt)
 file(REMOVE ${dgen_build_conf})
 file(APPEND ${dgen_build_conf} "<typesystem>\n")
@@ -251,25 +245,33 @@
 endforeach(package ${packages})
 file(APPEND ${dgen_build_conf} "</typesystem>\n")
 
-add_custom_command(OUTPUT ${dgen_impl}
-		    COMMAND ${CMAKE_COMMAND} -E remove -f ${dgen_impl}
-		    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 
-			${dgen_build_conf}
-		    COMMENT "Generating binding..."
-		    DEPENDS  generator ${gen_typesystem} ${gen_sources} 
-		)
-add_custom_target(dgen DEPENDS ${dgen_impl} COMMENT "")
+# foreach(dgen_impl ${files_for_gen})
+#     add_custom_command(OUTPUT ${dgen_impl}
+# 			COMMAND ${CMAKE_COMMAND} -E remove -f ${dgen_impl}
+# 			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 
+# 			    ${dgen_build_conf}
+# 			COMMENT "Generating binding..."
+# 			DEPENDS  generator ${gen_typesystem} ${gen_sources} 
+# 		    )
+# endforeach(dgen_impl ${files_for_gen})
+add_custom_target(dgen COMMENT "")
 
 macro(add_sources_for_generating)
-    foreach(source ${ARGN})
-	add_custom_command(OUTPUT "${source}"
-			COMMAND ""
-			ARGS ""
-			DEPENDS ${dgen_impl}
-			COMMENT ""
+    foreach(dgen_impl ${ARGN})
+	add_custom_command(OUTPUT ${dgen_impl}
+			    COMMAND ${CMAKE_COMMAND} -E remove -f ${ARGN}
+			    COMMAND "generator"
+			    ARGS ${GEN_OPT}  --qt-include-directory=${QT_INCLUDE_DIR} --output-directory=../  
+							--source-directory=${CMAKE_SOURCE_DIR}/generator 
+							qtjambi_masterinclude.h  
+							build_opengl.txt 
+			    COMMENT "Generating binding..."
+			    DEPENDS  generator ${gen_typesystem} ${gen_sources} 
 			)
-    endforeach(source ${allcppsources})
+	#add_custom_target(${target_name} DEPENDS ${dgen_impl})
+	#add_dependencies(dgen ${target_name})
+    endforeach(dgen_impl ${ARGN})
 endmacro(add_sources_for_generating)
\ No newline at end of file