OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-25 18:55:39 -06:00
Code Issues Packages Projects Releases Wiki Activity

Revert "glob for all Qt so files"

Browse Source 
This reverts commit 2ed6c5b167.
This commit is contained in:
Magne Sjaastad 2020-06-08 16:22:38 +02:00
parent 2ed6c5b167
commit 062bbf4d9b
1 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
ApplicationCode/CMakeLists.txt
View File

@ -650,24 +650,21 @@ if (RESINSIGHT_PRIVATE_INSTALL)
mark_as_advanced(FORCE RESINSIGHT_QT5_BUNDLE_LIBRARIES) mark_as_advanced(FORCE RESINSIGHT_QT5_BUNDLE_LIBRARIES)
if (RESINSIGHT_QT5_BUNDLE_LIBRARIES) if (RESINSIGHT_QT5_BUNDLE_LIBRARIES)
message( STATUS "Bundling of Qt5 libraries is enabled" ) message( STATUS "Bundling of Qt5 libraries is enabled" )
# Get root directory
get_property(_filepath TARGET "Qt5::Core" PROPERTY LOCATION_RELEASE)
get_filename_component(_dir ${_filepath} PATH)
foreach (qtlib ${QT_LIBRARIES}) foreach (qtlib ${QT_LIBRARIES})
get_target_property(FILE_NAME_FULL_PATH ${qtlib} LOCATION) get_target_property(FILE_NAME_FULL_PATH ${qtlib} LOCATION)
message (STATUS "${qtlib} location on disk - ${FILE_NAME_FULL_PATH}") message (STATUS "${qtlib} location on disk - ${FILE_NAME_FULL_PATH}")
get_filename_component(FILE_NAME_WE ${FILE_NAME_FULL_PATH} NAME_WE) get_filename_component(FILE_NAME_WE ${FILE_NAME_FULL_PATH} NAME_WE)
message (STATUS "${FILE_NAME_WE} namw without ext- ${FILE_NAME_WE}") set(FILE_NAME_FOR_INSTALL "${FILE_NAME_WE}.so.5")
#set(FILE_NAME_FOR_INSTALL "${FILE_NAME_WE}.so.5") message (STATUS "${qtlib} filename for install - ${FILE_NAME_FOR_INSTALL}")
#message (STATUS "${qtlib} filename for install - ${FILE_NAME_FOR_INSTALL}")
file(GLOB FILE_AND_SYMLINKS ${_dir}/${FILE_NAME_WE}.so*)
install(FILES ${FILE_AND_SYMLINKS} DESTINATION ${RESINSIGHT_INSTALL_FOLDER} ) install(FILES ${FILE_NAME_FULL_PATH} DESTINATION ${RESINSIGHT_INSTALL_FOLDER} RENAME ${FILE_NAME_FOR_INSTALL} )
endforeach() endforeach()
# Get root directory
get_property(_filepath TARGET "Qt5::Core" PROPERTY LOCATION_RELEASE)
get_filename_component(_dir ${_filepath} PATH)
# XcbQpa # XcbQpa
file(GLOB FILE_AND_SYMLINKS ${_dir}/libQt5XcbQpa.so*) file(GLOB FILE_AND_SYMLINKS ${_dir}/libQt5XcbQpa.so*)
install(FILES ${FILE_AND_SYMLINKS} DESTINATION ${RESINSIGHT_INSTALL_FOLDER} ) install(FILES ${FILE_AND_SYMLINKS} DESTINATION ${RESINSIGHT_INSTALL_FOLDER} )