ronso0 · ronso0 · Mar 30, 2021 · Mar 29, 2021 · Mar 29, 2021 · ronso0
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1134,6 +1134,7 @@ elseif (UNIX)
   set(MIXXX_INSTALL_LICENSEDIR "${CMAKE_INSTALL_DOCDIR}")
 endif()
 
+
 if(WIN32)
   target_compile_definitions(mixxx-lib PRIVATE __WINDOWS__)
 
@@ -1343,7 +1344,7 @@ install(
   FILES
     "${CMAKE_CURRENT_SOURCE_DIR}/README"
     "${CMAKE_CURRENT_SOURCE_DIR}/Mixxx-Manual.pdf"
-    "${CMAKE_CURRENT_SOURCE_DIR}/Mixxx-Keyboard-Shortcuts.pdf"
+    "${CMAKE_CURRENT_SOURCE_DIR}/res/Mixxx-Keyboard-Shortcuts.pdf"
   DESTINATION
     "${MIXXX_INSTALL_DOCDIR}"
 )
@@ -2639,6 +2640,10 @@ if(WAVPACK)
   target_link_libraries(mixxx-lib PUBLIC WavPack::wavpack)
 endif()
 
+# Configure file with build options
+file(RELATIVE_PATH MIXXX_INSTALL_DOCDIR_RELATIVE_TO_DATADIR "${CMAKE_INSTALL_PREFIX}/${MIXXX_INSTALL_DATADIR}" "${CMAKE_INSTALL_PREFIX}/${MIXXX_INSTALL_DOCDIR}")
+configure_file("${CMAKE_CURRENT_SOURCE_DIR}/src/config.h.in" "${CMAKE_CURRENT_BINARY_DIR}/src/config.h" @ONLY)
+
 # Packaging
 set(CPACK_PACKAGE_VENDOR "Mixxx Project")
 set(CPACK_PACKAGE_CONTACT "RJ Skerry-Ryan <rryan@mixxx.org>")

diff --git a/Mixxx-Keyboard-Shortcuts.pdf → res/Mixxx-Keyboard-Shortcuts.pdf b/Mixxx-Keyboard-Shortcuts.pdf → res/Mixxx-Keyboard-Shortcuts.pdf
diff --git a/src/config.h.in b/src/config.h.in
@@ -0,0 +1 @@
+#cmakedefine MIXXX_INSTALL_DOCDIR_RELATIVE_TO_DATADIR "@MIXXX_INSTALL_DOCDIR_RELATIVE_TO_DATADIR@"
diff --git a/src/widget/wmainmenubar.cpp b/src/widget/wmainmenubar.cpp
@@ -3,6 +3,7 @@
 #include <QDesktopServices>
 #include <QUrl>
 
+#include "config.h"
 #include "control/controlproxy.h"
 #include "defs_urls.h"
 #include "mixer/playermanager.h"
@@ -584,18 +585,18 @@ void WMainMenuBar::initialize() {
 #if defined(__APPLE__)
     // FIXME: We don't include the PDF manual in the bundle on OSX.
     // Default to the web-hosted version.
-#elif defined(__WINDOWS__)
-    // On Windows, the shortcut PDF sits in the same folder as the 'skins' folder.
-    if (kbdShortcutsDir.exists(MIXXX_KBD_SHORTCUTS_FILENAME)) {
-        qKeyboardShortcutsUrl = QUrl::fromLocalFile(
-                kbdShortcutsDir.absoluteFilePath(MIXXX_KBD_SHORTCUTS_FILENAME));
-    } else {
-        kbdShortcutsSuffix = externalLinkSuffix;
-    }
-#elif defined(__LINUX__)
-    // On GNU/Linux, the shortcut is installed to e.g. /usr/share/doc/mixxx/
-    if (kbdShortcutsDir.cd("../doc/mixxx") &&
-            kbdShortcutsDir.exists(MIXXX_KBD_SHORTCUTS_FILENAME)) {
+    kbdShortcutsSuffix = externalLinkSuffix;
+#elif defined(__WINDOWS__) or defined(__LINUX__)
+    // First check if the shortcut PDF exists in the resource directory (this
+    // is the case if the executable was started from the build directory and
+    // on Windows.
+    // If it's not found, check if it's in the MIXXX_INSTALL_DOCDIR (e.g.
+    // /usr/share/doc/ on GNU/Linux). We're using a path relative to
+    // MIXXX_INSTALL_DATADIR to allow custom install DESTDIR values.
+
+    if (kbdShortcutsDir.exists(MIXXX_KBD_SHORTCUTS_FILENAME) ||
+            (kbdShortcutsDir.cd(MIXXX_INSTALL_DOCDIR_RELATIVE_TO_DATADIR) &&
+                    kbdShortcutsDir.exists(MIXXX_KBD_SHORTCUTS_FILENAME))) {
         qKeyboardShortcutsUrl = QUrl::fromLocalFile(
                 kbdShortcutsDir.absoluteFilePath(MIXXX_KBD_SHORTCUTS_FILENAME));
     } else {
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		#cmakedefine MIXXX_INSTALL_DOCDIR_RELATIVE_TO_DATADIR "@MIXXX_INSTALL_DOCDIR_RELATIVE_TO_DATADIR@"
ronso0 Mar 30, 2021 Copy link Copy Markdown Owner Choose a reason for hiding this comment The reason will be displayed to describe this comment to others. Learn more. interesting, I wasn't aware that we can use cmake vars in the actual project code. somehow I considered those two entirely separate 'things' Holzhaus Mar 30, 2021 • edited Loading Copy link Copy Markdown Author Choose a reason for hiding this comment The reason will be displayed to describe this comment to others. Learn more. We can use them via configure_file or target_compile_definitions. The `#cmakedefine` is like a regular `#define` except that it maps to `undef` if the variable is not set.