diff --git a/App/CMakeLists.txt b/App/CMakeLists.txt index 5e2dacf21bd01f3117876db2ab8dc1b752823790..a1694c1a209261126737a024763c731c8d6b244b 100644 --- a/App/CMakeLists.txt +++ b/App/CMakeLists.txt @@ -111,8 +111,9 @@ install(FILES ${image_files} DESTINATION ${destination_images} COMPONENT Applica if(BA_APPLE_BUNDLE) install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/BornAgain.icns DESTINATION ${destination_bundle}/Contents/Resources/) - install(FILES ${CMAKE_SOURCE_DIR}/cmake/configurables/qt.conf - DESTINATION ${destination_bundle}/Contents/Resources/) + install(FILES ${CMAKE_SOURCE_DIR}/cmake/configurables/qt.conf.mac + DESTINATION ${destination_bundle}/Contents/Resources/ + RENAME qt.conf) # adjust MacOS bundle set(MACPK_ROOT_DIR "${CMAKE_INSTALL_PREFIX}/${destination_prefix}") @@ -144,7 +145,11 @@ endif() if(LINUX) set(LINUXPKG_MAIN_EXE "${CMAKE_BINARY_DIR}/bin/${executable_name}") - set(LINUXPKG_FRAMEWORK_DEST "${destination_framework}") + set(LINUXPKG_FRAMEWORK_DEST "${destination_lib}") + install(FILES ${CMAKE_SOURCE_DIR}/cmake/configurables/qt.conf.linux + DESTINATION ${destination_bin} + RENAME qt.conf) + configure_file( ${CMAKE_SOURCE_DIR}/devtools/deploy/linux/adjust_pkg_linux.sh.in ${BUILD_VAR_DIR}/adjust_pkg_linux.sh @ONLY)