feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

CMake Build: Fix MinGW libstdc++ dependency installation

Browse Source 
Change-Id: I8957991a86f1b5dc537e7da0b5cc47f645dd4511
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
This commit is contained in:
Cristian Adam
2020-01-31 17:15:47 +01:00
committed by Alessandro Portale
parent ba2a23834c
commit d66d82e7f6
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/QtCreatorDeployment.cmake
View File

@@ -147,9 +147,14 @@ if (CMAKE_VERSION VERSION_GREATER_EQUAL 3.16)
list(APPEND unresolved_deps libEGL.dll libGLESv2.dll) list(APPEND unresolved_deps libEGL.dll libGLESv2.dll)
endif() endif()
get_filename_component(compiler_dir \"${CMAKE_CXX_COMPILER}\" DIRECTORY)
file(TO_CMAKE_PATH \"${CMAKE_PREFIX_PATH}\" prefix_path) file(TO_CMAKE_PATH \"${CMAKE_PREFIX_PATH}\" prefix_path)
list(APPEND prefix_path \"\${compiler_dir}\")
# Add parent link directory paths. Needed for e.g. MinGW choco libstdc++-6.dll
foreach(path \"${CMAKE_CXX_IMPLICIT_LINK_DIRECTORIES}\")
get_filename_component(parent_path \"\${path}\" DIRECTORY)
list(APPEND prefix_path \"\${parent_path}\")
endforeach()
foreach(so IN LISTS unresolved_deps) foreach(so IN LISTS unresolved_deps)
string(REPLACE \"@rpath/\" \"\" so \"\${so}\") string(REPLACE \"@rpath/\" \"\" so \"\${so}\")
get_filename_component(so_dir \"\${so}\" DIRECTORY) get_filename_component(so_dir \"\${so}\" DIRECTORY)