Mercurial > projects > qtd
changeset 280:bcc498ccf334
Fix for windows build
author | SokoL_SD |
---|---|
date | Fri, 09 Oct 2009 08:43:15 +0000 |
parents | 519befd5a5d1 |
children | 7f2e3ffa1c33 |
files | CMakeLists.txt |
diffstat | 1 files changed, 16 insertions(+), 16 deletions(-) [+] |
line wrap: on
line diff
--- a/CMakeLists.txt Fri Oct 09 06:17:51 2009 +0000 +++ b/CMakeLists.txt Fri Oct 09 08:43:15 2009 +0000 @@ -444,7 +444,6 @@ set_property(TARGET cpp_${package} PROPERTY RUNTIME_OUTPUT_DIRECTORY lib) set_property(TARGET cpp_${package} PROPERTY ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/CMakeFiles) set(link_cpp ${link_cpp} ${QT_QT${package_upper}_LIBRARY}) - target_link_libraries(cpp_${package} ${link_cpp} ) if(CPP_SHARED) else(CPP_SHARED) ## Get an objects list. It will be used in building the D part. @@ -465,22 +464,23 @@ set(build_type STATIC) endif(BUILD_SHARED_LIBRARIES) - ## A test of packages dependencies. + ## Package dependencies. foreach(req ${required}) - set(is_found) - foreach(pack ${packages_big}) - if("${pack}" STREQUAL "${req}") - set(is_found 1) - break(pack ${packages_big}) - endif("${pack}" STREQUAL "${req}") - endforeach(pack ${packages_big}) - if(NOT is_found) - message(FATAL_ERROR "Package ${package_big} requires ${req}, but it is not found") - endif(NOT is_found) - string(TOUPPER ${req} req_upper) - string(TOLOWER ${req} req_lower) - set(link_cpp ${link_cpp} cpp_${req_lower} ${QT_QT${req_upper}_LIBRARY}) - endforeach(req ${require}) + set(is_found) + foreach(pack ${packages_big}) + if("${pack}" STREQUAL "${req}") + set(is_found 1) + break(pack ${packages_big}) + endif("${pack}" STREQUAL "${req}") + endforeach(pack ${packages_big}) + if(NOT is_found) + message(FATAL_ERROR "Package ${package_big} requires ${req}, but it is not found") + endif(NOT is_found) + string(TOUPPER ${req} req_upper) + string(TOLOWER ${req} req_lower) + set(link_cpp ${link_cpp} cpp_${req_lower} ${QT_QT${req_upper}_LIBRARY}) + endforeach(req ${require}) + target_link_libraries(cpp_${package} ${link_cpp} ) set(d_objs ${d_objs} ${objects}) if(CPP_SHARED)