Mercurial > projects > qtd
diff CMakeLists.txt @ 248:7664de4a55e5
Fixed #23.
QtD_QObjectEntity is not created dynamically for shell classes any more.
Class initialization is now performed by static constructors.
When wrapping QObjects returned from functions, their run-time types are now taken into account.
QObjects are allocated on GC heap, a doubly-linked list is used to prevent them from been collected (arguably a better solution than allocating on C heap and adding GC ranges)
Minor changes (including unnecessary).
| author | maxter |
|---|---|
| date | Thu, 20 Aug 2009 14:47:17 +0000 |
| parents | 405f49532492 |
| children | 37eed70de029 |
line wrap: on
line diff
--- a/CMakeLists.txt Fri Jul 31 11:05:22 2009 +0000 +++ b/CMakeLists.txt Thu Aug 20 14:47:17 2009 +0000 @@ -15,7 +15,7 @@ Please delete them. Or you can restart cmake with `-DALLOW_IN_SOURCE_BUILDS=1`, but it is not -recomended. +recommended. ") endif(CMAKE_SOURCE_DIR STREQUAL CMAKE_BINARY_DIR AND NOT ALLOW_IN_SOURCE_BUILDS) @@ -389,7 +389,11 @@ endforeach(d_source ${d_generated_files}) set(classes ArrayOps ${classes}) foreach(class ${classes}) - set(d_sources ${d_sources} ${CMAKE_BINARY_DIR}/qt/${package}/${class}.d) + set(d_sources ${d_sources} ${CMAKE_BINARY_DIR}/qt/${package}/${class}.d) + set(aux_name ${CMAKE_BINARY_DIR}/qt/${package}/${class}_aux.d ) + if(EXISTS ${aux_name}) + set(d_sources ${d_sources} ${aux_name}) + endif(EXISTS ${aux_name}) set(cpp_sources ${cpp_sources} ${CMAKE_BINARY_DIR}/cpp/qt_${package}/${class}_shell.cpp) endforeach(class ${classes}) set(files_for_gen ${files_for_gen} ${cpp_sources} ${d_sources}) @@ -417,7 +421,7 @@ set(regexp_str_tmp "(${ver_safe_tmp}/|${cbd_safe_tmp}/|${csd_safe_tmp}/|)(.+)") string(REGEX REPLACE ${regexp_str_tmp} "\\2" ins_path "${path}") install(FILES ${d_source} DESTINATION include/d/${ins_path} COMPONENT qtd RENAME ${name}.di) - install(FILES ${path}/${name}_enum.d DESTINATION include/d/${ins_path} COMPONENT qtd RENAME ${name}_enum.di OPTIONAL) + install(FILES ${path}/${name}_aux.d DESTINATION include/d/${ins_path} COMPONENT qtd RENAME ${name}_aux.di OPTIONAL) endforeach(d_source ${d_sources}) endif(NOT GENERATE_DI_FILES)