forked from qt-creator/qt-creator
qtcreatorcdbext: Forward CMAKE_PREFIX_PATH to the subprojects
Otherwise find_package(Clang) will not find the LLVM installation and lldb.exe will not be deployed in multi-arch configurations. Change-Id: I7c067ea68cd047f45b7cca48f2d3798f04010586 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
@@ -23,15 +23,19 @@ if (NOT QT_CREATOR_API_DEFINED)
|
||||
set(generator "Visual Studio 17 2022")
|
||||
endif()
|
||||
|
||||
string(REPLACE ";" "|" CMAKE_PREFIX_PATH_ALT_SEP "${CMAKE_PREFIX_PATH}")
|
||||
|
||||
macro (setup_library arch)
|
||||
ExternalProject_Add(${arch}-bld
|
||||
SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}"
|
||||
CMAKE_GENERATOR "${generator}"
|
||||
CMAKE_GENERATOR_PLATFORM "${arch}"
|
||||
LIST_SEPARATOR |
|
||||
CMAKE_ARGS
|
||||
-D${PROJECT_NAME}-MultiBuild=ON
|
||||
-DPythonTargetArchDll=${PythonTarget${arch}Dll}
|
||||
-DPython3_ROOT_DIR=${Python3_ROOT_DIR}
|
||||
-DCMAKE_PREFIX_PATH=${CMAKE_PREFIX_PATH_ALT_SEP}
|
||||
BUILD_COMMAND
|
||||
${CMAKE_COMMAND} --build . --config ${CMAKE_BUILD_TYPE}
|
||||
INSTALL_COMMAND
|
||||
@@ -54,6 +58,12 @@ if (NOT QT_CREATOR_API_DEFINED)
|
||||
DESTINATION .
|
||||
COMPONENT qtcreatorcdbext
|
||||
)
|
||||
install(CODE
|
||||
"if (EXISTS \"${CMAKE_BINARY_DIR}/bin\")
|
||||
file(COPY \"${CMAKE_BINARY_DIR}/bin\" DESTINATION \"${CMAKE_INSTALL_PREFIX}\")
|
||||
endif()"
|
||||
COMPONENT qtcreatorcdbext
|
||||
)
|
||||
endif()
|
||||
|
||||
return()
|
||||
|
Reference in New Issue
Block a user