Fix problems that occur when running out of CMake build dir

This commit is contained in:
Rob Gowin 2017-09-08 11:54:17 -05:00 committed by Geert Janssens
parent 8efe0f83e6
commit 739ce35f6a
2 changed files with 10 additions and 4 deletions

View File

@ -27,7 +27,7 @@ SET_LOCAL_DIST(po_DIST_local ${po_SOURCES} CMakeLists.txt ChangeLog Makevars POT
SET(po_DIST ${po_DIST_local} ${po_glossary_DIST} PARENT_SCOPE) SET(po_DIST ${po_DIST_local} ${po_glossary_DIST} PARENT_SCOPE)
FOREACH(lingua ${ALL_LINGUAS}) FOREACH(lingua ${ALL_LINGUAS})
SET(_OUTPUT_FILE ${lingua}.gmo) SET(_OUTPUT_FILE ${lingua}.mo)
LIST(APPEND CATALOGS ${_OUTPUT_FILE}) LIST(APPEND CATALOGS ${_OUTPUT_FILE})
ADD_CUSTOM_COMMAND( ADD_CUSTOM_COMMAND(
OUTPUT ${_OUTPUT_FILE} OUTPUT ${_OUTPUT_FILE}
@ -35,11 +35,11 @@ FOREACH(lingua ${ALL_LINGUAS})
) )
SET(_BUILD_FILE_DIR ${DATADIR_BUILD}/locale/${lingua}/LC_MESSAGES) SET(_BUILD_FILE_DIR ${DATADIR_BUILD}/locale/${lingua}/LC_MESSAGES)
MAKE_DIRECTORY(${_BUILD_FILE_DIR}) MAKE_DIRECTORY(${_BUILD_FILE_DIR})
SET(_BUILD_FILE ${_BUILD_FILE_DIR}/gnucash.gmo) SET(_BUILD_FILE ${_BUILD_FILE_DIR}/gnucash.mo)
LIST(APPEND BUILD_CATALOGS ${_BUILD_FILE}) LIST(APPEND BUILD_CATALOGS ${_BUILD_FILE})
ADD_CUSTOM_COMMAND( ADD_CUSTOM_COMMAND(
OUTPUT ${_BUILD_FILE} OUTPUT ${_BUILD_FILE}
COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_BINARY_DIR}/${lingua}.gmo ${_BUILD_FILE} COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_BINARY_DIR}/${lingua}.mo ${_BUILD_FILE}
DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${_OUTPUT_FILE} DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${_OUTPUT_FILE}
#APPEND #APPEND
) )
@ -50,7 +50,7 @@ ADD_CUSTOM_TARGET(po-gmo-build ALL DEPENDS ${BUILD_CATALOGS})
FOREACH(lingua ${ALL_LINGUAS}) FOREACH(lingua ${ALL_LINGUAS})
INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${lingua}.gmo RENAME gnucash.mo DESTINATION share/locale/${lingua}/LC_MESSAGES) INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${lingua}.mo RENAME gnucash.mo DESTINATION share/locale/${lingua}/LC_MESSAGES)
ENDFOREACH(lingua) ENDFOREACH(lingua)

View File

@ -62,3 +62,9 @@ INSTALL(FILES ${gnome_search_HEADERS} DESTINATION include/gnucash)
SET(gnome_search_GLADE dialog-search.glade) SET(gnome_search_GLADE dialog-search.glade)
INSTALL(FILES ${gnome_search_GLADE} DESTINATION share/gnucash/gtkbuilder) INSTALL(FILES ${gnome_search_GLADE} DESTINATION share/gnucash/gtkbuilder)
FILE(COPY .
DESTINATION ${DATADIR_BUILD}/gnucash/gtkbuilder
PATTERN Makefile.* EXCLUDE
PATTERN CMakeLists.txt EXCLUDE)