Skip to content

Commit

Permalink
If we built eht_bind install it with the package
Browse files Browse the repository at this point in the history
Signed-off-by: Geoff Hutchison <[email protected]>
  • Loading branch information
ghutchis committed May 10, 2023
1 parent 8dcd53b commit 7fe3ad9
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 2 deletions.
2 changes: 1 addition & 1 deletion avogadro/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
12 changes: 11 additions & 1 deletion cmake/AvogadroCPack.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down Expand Up @@ -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)
Expand Down

0 comments on commit 7fe3ad9

Please sign in to comment.