From b667cf097eabcdbb6dcad029c451382db9b124f2 Mon Sep 17 00:00:00 2001 From: orbea Date: Tue, 25 Apr 2017 22:05:49 -0700 Subject: [PATCH] Add BINDIR and MANDIR --- CMakeLists.txt | 6 ++++-- src/citra/CMakeLists.txt | 2 +- src/citra_qt/CMakeLists.txt | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 306959e24..db328122e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -196,6 +196,8 @@ ELSEIF (WIN32) ENDIF (MINGW) ELSEIF (CMAKE_SYSTEM_NAME MATCHES "^(Linux|kFreeBSD|GNU|SunOS)$") set(PLATFORM_LIBRARIES rt) + set(BINDIR ${CMAKE_INSTALL_PREFIX}/bin CACHE PATH "BINDIR") + set(MANDIR ${CMAKE_INSTALL_PREFIX}/share/man CACHE PATH "MANDIR") ENDIF (APPLE) # MINGW: GCC does not support codecvt, so use iconv instead @@ -291,11 +293,11 @@ endif() if(UNIX) if(ENABLE_SDL2) install(FILES "${CMAKE_SOURCE_DIR}/dist/citra.6" - DESTINATION "${CMAKE_INSTALL_PREFIX}/share/man/man6") + DESTINATION "${MANDIR}/man6") endif() if (ENABLE_QT) install(FILES "${CMAKE_SOURCE_DIR}/dist/citra-qt.6" - DESTINATION "${CMAKE_INSTALL_PREFIX}/share/man/man6") + DESTINATION "${MANDIR}/man6") endif() endif() diff --git a/src/citra/CMakeLists.txt b/src/citra/CMakeLists.txt index 47231ba71..f4bbf7907 100644 --- a/src/citra/CMakeLists.txt +++ b/src/citra/CMakeLists.txt @@ -26,7 +26,7 @@ endif() target_link_libraries(citra ${PLATFORM_LIBRARIES} Threads::Threads) if(UNIX AND NOT APPLE) - install(TARGETS citra RUNTIME DESTINATION "${CMAKE_INSTALL_PREFIX}/bin") + install(TARGETS citra RUNTIME DESTINATION "${BINDIR}") endif() if (MSVC) diff --git a/src/citra_qt/CMakeLists.txt b/src/citra_qt/CMakeLists.txt index 3e6106f0a..ba46a23e8 100644 --- a/src/citra_qt/CMakeLists.txt +++ b/src/citra_qt/CMakeLists.txt @@ -102,7 +102,7 @@ target_link_libraries(citra-qt ${OPENGL_gl_LIBRARY} ${CITRA_QT_LIBS}) target_link_libraries(citra-qt ${PLATFORM_LIBRARIES} Threads::Threads) if(UNIX AND NOT APPLE) - install(TARGETS citra-qt RUNTIME DESTINATION "${CMAKE_INSTALL_PREFIX}/bin") + install(TARGETS citra-qt RUNTIME DESTINATION "${BINDIR}") endif() if (MSVC)