Mercurial > projects > qtd
changeset 203:d3383b16f1d7
Add a 'NO_DEPS_SOURCES' option to the 'add_d_target' macro. And use it for resources and forms in QtD examples.
author | SokoL_SD |
---|---|
date | Mon, 13 Jul 2009 17:27:34 +0000 |
parents | 57c3714ed282 |
children | 6aeaf24018d7 |
files | CMakeLists.txt cmake/FindD.cmake |
diffstat | 2 files changed, 7 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/CMakeLists.txt Mon Jul 13 13:47:15 2009 +0000 +++ b/CMakeLists.txt Mon Jul 13 17:27:34 2009 +0000 @@ -199,7 +199,7 @@ set(qtd_libs ${${package}_lib_param} ${qtd_libs}) endif(NOT is_founded) endforeach(package ${PACKAGES_tmp}) - add_d_program(${name} ${SOURCES_tmp} ${res_sources} ${uic_sources} + add_d_program(${name} ${SOURCES_tmp} NO_DEPS_SOURCES ${res_sources} ${uic_sources} DEPENDS ${res_sources} INCLUDES ${QTD_IMPORT_PATH} ${CMAKE_CURRENT_BINARY_DIR} LIB_PATHS ${QTD_LIBRARIES_PATH} ${CMAKE_SOURCE_DIR}/lib LIBS ${qtd_libs}) ## TODO: Enable on windows too.
--- a/cmake/FindD.cmake Mon Jul 13 13:47:15 2009 +0000 +++ b/cmake/FindD.cmake Mon Jul 13 17:27:34 2009 +0000 @@ -282,6 +282,7 @@ set(INCLUDES_tmp ) set(FLAGS_tmp ) set(SOURCES_tmp ) + set(GEN_FILES_tmp ) set(OBJECTS_tmp ) set(LIBS_tmp ) set(LIB_PATHS_tmp) @@ -292,7 +293,7 @@ set(link_flags_tmp ) ## Parse parameters list. - set(params_tmp TYPE INCLUDES FLAGS SOURCES OBJECTS LIBS LIB_PATHS DEPENDS OUTPUT_PATH) + set(params_tmp TYPE INCLUDES FLAGS SOURCES NO_DEPS_SOURCES OBJECTS LIBS LIB_PATHS DEPENDS OUTPUT_PATH) foreach(arg_tmp ${ARGN}) set(founded_type_tmp) if(${arg_tmp} STREQUAL "DETECT_DEPENDS") @@ -404,9 +405,11 @@ set(compile_flags_tmp ${compile_flags_tmp} ${D_${CMAKE_BUILD_TYPE_UPPER}_FLAGS}) endif(CMAKE_BUILD_TYPE) - if(auto_detect_depentes_tmp) - get_files_depends(SOURCES_tmp ${SOURCES_tmp}) + if(auto_detect_depentes_tmp) + get_files_depends(tmp ${SOURCES_tmp}) + set(SOURCES_tmp ${tmp}) endif(auto_detect_depentes_tmp) + set(SOURCES_tmp ${SOURCES_tmp} ${NO_DEPS_SOURCES}) set(used_ar_tmp) get_filename_component(output_path_tmp ${output_name_tmp} PATH)