mirror of
https://github.com/OPM/ResInsight.git
synced 2025-02-25 18:55:39 -06:00
Get Qt DLLs from bin instead of lib. Do not include Linux shell script for Windows packaging.
This commit is contained in:
parent
8a8fd5a0d0
commit
18a5501601
@ -351,10 +351,10 @@ endif()
|
||||
|
||||
if (${CMAKE_SYSTEM_NAME} MATCHES "Windows")
|
||||
set (RESINSIGHT_FILES
|
||||
${QT_LIBRARY_DIR}/QtCore4.dll
|
||||
${QT_LIBRARY_DIR}/QtGui4.dll
|
||||
${QT_LIBRARY_DIR}/QtOpenGL4.dll
|
||||
${QT_LIBRARY_DIR}/QtNetwork4.dll
|
||||
${QT_BINARY_DIR}/QtCore4.dll
|
||||
${QT_BINARY_DIR}/QtGui4.dll
|
||||
${QT_BINARY_DIR}/QtOpenGL4.dll
|
||||
${QT_BINARY_DIR}/QtNetwork4.dll
|
||||
)
|
||||
endif()
|
||||
|
||||
@ -367,7 +367,10 @@ set (RESINSIGHT_FILES ${RESINSIGHT_FILES}
|
||||
install(TARGETS ResInsight DESTINATION ${RESINSIGHT_FINAL_NAME})
|
||||
|
||||
install(FILES ${RESINSIGHT_FILES} DESTINATION ${RESINSIGHT_FINAL_NAME} )
|
||||
install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/resinsight DESTINATION ${RESINSIGHT_FINAL_NAME} PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE )
|
||||
|
||||
if (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
|
||||
install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/resinsight DESTINATION ${RESINSIGHT_FINAL_NAME} PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE )
|
||||
endif()
|
||||
|
||||
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user