SHS/qad
4
1
Fork 0
Code Issues 5 Pull Requests Releases Wiki Activity

CMake refactoring

Browse Source
This commit is contained in:
Пелипенко Иван
2020-09-04 22:31:50 +03:00
parent bd421ff5af
commit c576a14deb
29 changed files with 316 additions and 402 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
cmake/QtWraps.cmake
View File

@@ -8,6 +8,7 @@ If Qt4/5 found, set
* Qt<4/5>_BIN var to Qt binary dir
* Qt<4/5>_PLUGINS_DIR var to Qt plugins dir
* Qt<4/5>_LANG_DIR var to Qt translations dir
Also set variable SOME_QT_FOUND
@@ -166,6 +167,9 @@ macro(find_qt)
set(Qt${_v}_PLUGINS_DIR)
set(Qt${_v}_LANG_DIR)
endforeach()
if (NOT DEFINED SOME_QT_FOUND)
set(SOME_QT_FOUND 0 CACHE BOOL "")
endif()
set(_NEED_SOME 0)
set(_QUIET)
foreach(_i ${ARGN})
@@ -270,6 +274,7 @@ macro(find_qt)
endif()
foreach(_v ${_QT_VERSIONS_})
if (LOCAL_FOUND${_v})
set(SOME_QT_FOUND 1 CACHE BOOL "" FORCE)
foreach(_p ${Qt${_v}_INCLUDES})
list(APPEND MOC_INC_Qt${_v} "-I${_p}")
#message("${_p}")
@@ -534,7 +539,8 @@ 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} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR}/qt${_v} ${Qt${_v}_INCLUDES})
target_include_directories(${_TARGET} PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/qt${_v})
target_include_directories(${_TARGET} PUBLIC ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR} ${Qt${_v}_INCLUDES})
__qt_set_defines(${_NAME} ${_TARGET})
#message("add lib: \"${_TARGET}\"")