From 7fe3ad9e4a8830cc3070c2fce9b3a673fceb1113 Mon Sep 17 00:00:00 2001 From: Geoff Hutchison Date: Wed, 10 May 2023 02:41:48 +0200 Subject: [PATCH] If we built eht_bind install it with the package Signed-off-by: Geoff Hutchison --- avogadro/CMakeLists.txt | 2 +- cmake/AvogadroCPack.cmake | 12 +++++++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/avogadro/CMakeLists.txt b/avogadro/CMakeLists.txt index 440fa1d7..6c79b569 100644 --- a/avogadro/CMakeLists.txt +++ b/avogadro/CMakeLists.txt @@ -70,7 +70,7 @@ install(DIRECTORY "${AvogadroApp_SOURCE_DIR}/../avogadro-i18n/avogadroapp/" if(APPLE OR WIN32 OR INSTALL_BUNDLE_FILES) # copy the qt translation files get_filename_component(_qttranslationdir "${Qt5_DIR}/../../../translations" ABSOLUTE) -message(STATUS "Trying to install Qt translations ${_qttranslationdir}") +message(STATUS "Install Qt translations ${_qttranslationdir}") install(DIRECTORY "${_qttranslationdir}/" DESTINATION "${INSTALL_DATA_DIR}/avogadro2/i18n" FILES_MATCHING PATTERN "qt_*.qm" PATTERN "qtbase*.qm" diff --git a/cmake/AvogadroCPack.cmake b/cmake/AvogadroCPack.cmake index a7459584..cde4c218 100644 --- a/cmake/AvogadroCPack.cmake +++ b/cmake/AvogadroCPack.cmake @@ -17,7 +17,7 @@ if(APPLE) set(CPACK_BUNDLE_ICON "${CPACK_PACKAGE_ICON}") if(${CMAKE_VERSION} VERSION_GREATER "3.19.0") - # add the codesign options to the packageq + # add the codesign options to the package configure_file("${CMAKE_CURRENT_LIST_DIR}/deploy-osx.cmake.in" "${AvogadroApp_BINARY_DIR}/deploy-osx.cmake" @ONLY) set(CPACK_PRE_BUILD_SCRIPTS "${AvogadroApp_BINARY_DIR}/deploy-osx.cmake") endif() @@ -60,6 +60,16 @@ if(INSTALL_BUNDLE_FILES) WORLD_READ WORLD_EXECUTE) endif() + # look for yaehmop (eht_bind) + find_program(EHT_BIND_EXE eht_bind) + if(EHT_BIND_EXE) + install(FILES ${EHT_BIND_EXE} DESTINATION ${INSTALL_RUNTIME_DIR} + PERMISSIONS + OWNER_READ OWNER_WRITE OWNER_EXECUTE + GROUP_READ GROUP_EXECUTE + WORLD_READ WORLD_EXECUTE) + endif() + find_program(OBABEL_EXE obabel) if(OBABEL_EXE) find_program(OBMM_EXE obmm)