git-svn-id: svn://db.shs.com.ru/libs@260 a8b55f48-bf90-11e4-a774-851b48703e85

This commit is contained in:
2017-08-09 08:21:43 +00:00
parent 28420cccc5
commit 24c04aa44a
4 changed files with 29 additions and 16 deletions

View File

@@ -349,7 +349,7 @@ macro(qt_add_executable _NAME)
_qt_split_add_args(_PREF _ARGS ${ARGN})
#message("${_PREF}")
#message("${_ARGS}")
cmake_policy(SET CMP0020 NEW)
#cmake_policy(SET CMP0020 NEW)
set(_TARGET ${_NAME}${TARGET_SUFFIX_Qt${_v}})
add_executable(${_TARGET} ${_PREF} ${_ARGS})
set(_${_NAME}_is_qt 1)
@@ -401,6 +401,7 @@ macro(qt_target_link_libraries _NAME)
list(APPEND _ARGS ${_i})
endif()
endforeach()
cmake_policy(SET CMP0020 OLD)
target_link_libraries(${_TARGET} ${Qt${_v}_LIBRARIES} ${_ARGS})
#message("link ${_TARGET}: ${Qt${_v}_LIBRARIES} ${_ARGS}")
endif()