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

This commit is contained in:
2017-08-10 11:17:36 +00:00
parent 937aa0972f
commit acdc307e9d

View File

@@ -353,7 +353,7 @@ macro(qt_add_executable _NAME)
set(_TARGET ${_NAME}${TARGET_SUFFIX_Qt${_v}})
add_executable(${_TARGET} ${_PREF} ${_ARGS})
set(_${_NAME}_is_qt 1)
target_include_directories(${_TARGET} PUBLIC ${CMAKE_CURRENT_BINARY_DIR}/qt${_v} ${Qt${_v}_INCLUDES})
target_include_directories(${_TARGET} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}/qt${_v} ${Qt${_v}_INCLUDES})
### add_definitions(${Qt5Widgets_DEFINITIONS})
### target_compile_definitions(${_TARGET} PUBLIC ${CMAKE_CURRENT_BINARY_DIR}/qt${_v} ${Qt${_v}_INCLUDES})
#message("add exe: \"${_TARGET}\", \"${_PREF}\"")
@@ -375,7 +375,7 @@ macro(qt_add_library _NAME)
set(_TARGET ${_NAME}${TARGET_SUFFIX_Qt${_v}})
add_library(${_TARGET} ${_PREF} ${_ARGS})
set(_${_NAME}_is_qt 1)
target_include_directories(${_TARGET} PUBLIC ${CMAKE_CURRENT_BINARY_DIR}/qt${_v} ${Qt${_v}_INCLUDES})
target_include_directories(${_TARGET} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}/qt${_v} ${Qt${_v}_INCLUDES})
#message("add lib: \"${_TARGET}\"")
endif()
endforeach()