summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--cmake/Functions.cmake7
1 files changed, 6 insertions, 1 deletions
diff --git a/cmake/Functions.cmake b/cmake/Functions.cmake
index c66e65e71..37fd593a9 100644
--- a/cmake/Functions.cmake
+++ b/cmake/Functions.cmake
@@ -76,6 +76,11 @@ function(get_qt_features outList module)
endfunction()
function(create_cxx_config cmakeTarget arch configFileName)
+ if(NOT QT_SUPERBUILD)
+ get_target_property(mocFilePath Qt6::moc IMPORTED_LOCATION)
+ else()
+ set(mocFilePath "${QT_BUILD_DIR}/${INSTALL_LIBEXECDIR}/moc${CMAKE_EXECUTABLE_SUFFIX}")
+ endif()
file(GENERATE
OUTPUT $<CONFIG>/${arch}/${configFileName}
CONTENT "\
@@ -83,7 +88,7 @@ function(create_cxx_config cmakeTarget arch configFileName)
set(GN_DEFINES \"$<TARGET_PROPERTY:COMPILE_DEFINITIONS>\")\n\
set(GN_LINK_OPTIONS \"$<TARGET_PROPERTY:LINK_OPTIONS>\")\n\
set(GN_CXX_COMPILE_OPTIONS \"$<TARGET_PROPERTY:COMPILE_OPTIONS>\")\n\
- set(GN_MOC_PATH \"$<TARGET_FILE:Qt::moc>\")"
+ set(GN_MOC_PATH \"${mocFilePath}\")"
# set(GN_LIBS $<TARGET_PROPERTY:LINK_LIBRARIES>)
CONDITION $<COMPILE_LANGUAGE:CXX>
TARGET ${cmakeTarget}