Skip to content

Commit 2f166fb

Browse files
committed
WIP: Fix qttools build
1 parent ecdf19b commit 2f166fb

File tree

1 file changed

+7
-3
lines changed

1 file changed

+7
-3
lines changed

qt-5.15.1.cmake

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -572,13 +572,17 @@ superbuild_package(
572572
BUILD_CONDITION ${use_system_qt}
573573
BUILD [[
574574
CONFIGURE_COMMAND
575-
"${CMAKE_COMMAND}" -E make_directory src/assistant
576-
COMMAND
577-
"${CMAKE_COMMAND}" -E chdir src/assistant "@qmake@" "${SOURCE_DIR}/src/assistant"
575+
"@qmake@" "${SOURCE_DIR}"
578576
COMMAND
579577
"${CMAKE_COMMAND}" -E make_directory src/linguist
580578
COMMAND
581579
"${CMAKE_COMMAND}" -E chdir src/linguist "@qmake@" "${SOURCE_DIR}/src/linguist"
580+
$<$<NOT:$<BOOL:@ANDROID@>>:COMMAND
581+
COMMAND
582+
"${CMAKE_COMMAND}" -E make_directory src/assistant
583+
COMMAND
584+
"${CMAKE_COMMAND}" -E chdir src/assistant "@qmake@" "${SOURCE_DIR}/src/assistant"
585+
>
582586
BUILD_COMMAND
583587
"$(MAKE)" -C src/linguist
584588
$<$<NOT:$<BOOL:@ANDROID@>>:COMMAND

0 commit comments

Comments
 (0)