Use GNUInstallDirs in CMake Builds

Provides correct file layout when building distribution tarballs.
Fixes Bugs 790840 and 790841.
This commit is contained in:
John Ralls
2017-11-28 14:25:35 -08:00
parent e92a1b3723
commit 5204100d53
41 changed files with 175 additions and 173 deletions

View File

@@ -92,9 +92,9 @@ TARGET_INCLUDE_DIRECTORIES (gnc-backend-xml-utils
TARGET_COMPILE_DEFINITIONS (gnc-backend-xml-utils PRIVATE -DG_LOG_DOMAIN=\"gnc.backend.xml\" -DU_SHOW_CPLUSPLUS_API=0)
INSTALL(TARGETS gnc-backend-xml-utils
LIBRARY DESTINATION lib
ARCHIVE DESTINATION lib
RUNTIME DESTINATION bin)
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
# No headers to install
# ----
@@ -109,20 +109,20 @@ TARGET_LINK_LIBRARIES(gncmod-backend-xml gnc-backend-xml-utils gncmod-engine
TARGET_COMPILE_DEFINITIONS (gncmod-backend-xml PRIVATE -DG_LOG_DOMAIN=\"gnc.backend.xml\" -DU_SHOW_CPLUSPLUS_API=0)
SET(LIB_DIR lib/gnucash)
SET(LIB_DIR ${CMAKE_INSTALL_LIBDIR}/gnucash)
IF (WIN32)
SET(LIB_DIR bin)
SET(LIB_DIR ${CMAKE_INSTALL_BINDIR})
ENDIF(WIN32)
IF (APPLE)
SET_TARGET_PROPERTIES (gncmod-backend-xml PROPERTIES INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/${LIB_DIR}")
SET_TARGET_PROPERTIES (gncmod-backend-xml PROPERTIES INSTALL_NAME_DIR "${CMAKE_INSTALL_FULL_LIBDIR}")
ENDIF()
INSTALL(TARGETS gncmod-backend-xml
LIBRARY DESTINATION ${LIB_DIR}
ARCHIVE DESTINATION ${LIB_DIR}
RUNTIME DESTINATION bin)
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
# ----