From 55b9fd5beaeef79063e7340d01f5df7f45982568 Mon Sep 17 00:00:00 2001
From: Jan Holthuis <jan.holthuis@ruhr-uni-bochum.de>
Date: Thu, 19 Mar 2020 17:52:45 +0100
Subject: CMakeLists: Fix extension import error when running from build dir

---
 CMakeLists.txt | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'CMakeLists.txt')

diff --git a/CMakeLists.txt b/CMakeLists.txt
index f49f91450c..1f853743d4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1139,11 +1139,19 @@ if(UNIX)
     COMMAND ${CMAKE_COMMAND} -E create_symlink "${CMAKE_CURRENT_SOURCE_DIR}/res" "${CMAKE_CURRENT_BINARY_DIR}/res"
     COMMENT "Symlinking resources to build directory..."
   )
+  add_custom_target(mixxx-script
+    COMMAND ${CMAKE_COMMAND} -E create_symlink "${CMAKE_CURRENT_SOURCE_DIR}/script" "${CMAKE_CURRENT_BINARY_DIR}/script"
+    COMMENT "Symlinking to build directory..."
+  )
 else()
   add_custom_target(mixxx-res
     COMMAND ${CMAKE_COMMAND} -E copy_if_different "${CMAKE_CURRENT_SOURCE_DIR}/res" "${CMAKE_CURRENT_BINARY_DIR}/"
     COMMENT "Copying resources to build directory..."
   )
+  add_custom_target(mixxx-script
+    COMMAND ${CMAKE_COMMAND} -E copy_if_different "${CMAKE_CURRENT_SOURCE_DIR}/script" "${CMAKE_CURRENT_BINARY_DIR}/"
+    COMMENT "Copying QScriptEngine extensions to build directory..."
+  )
 endif()
 add_dependencies(mixxx-lib mixxx-res)
 
-- 
cgit v1.2.3


From 77d64a19862da4c4ef474608e5399787553d6bc2 Mon Sep 17 00:00:00 2001
From: Jan Holthuis <jan.holthuis@ruhr-uni-bochum.de>
Date: Thu, 19 Mar 2020 17:53:25 +0100
Subject: CMakeLists: Install QScriptEngine extensions, too

---
 CMakeLists.txt | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'CMakeLists.txt')

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1f853743d4..4fc8f69e43 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -885,6 +885,14 @@ install(
     ${CMAKE_INSTALL_DATADIR}/mixxx
 )
 
+# QScriptEngine extensions
+install(
+  DIRECTORY
+    ${CMAKE_CURRENT_SOURCE_DIR}/script
+  DESTINATION
+    ${CMAKE_INSTALL_DATADIR}/mixxx
+)
+
 # Licenses
 install(
   FILES
-- 
cgit v1.2.3


From de05a4af36f18bafbd0499210073d90514cef7fb Mon Sep 17 00:00:00 2001
From: Jan Holthuis <jan.holthuis@ruhr-uni-bochum.de>
Date: Fri, 20 Mar 2020 14:17:19 +0100
Subject: CMake: Add mixxx-script depedency for mixxx-lib

---
 CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'CMakeLists.txt')

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4fc8f69e43..c71792799e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1161,7 +1161,7 @@ else()
     COMMENT "Copying QScriptEngine extensions to build directory..."
   )
 endif()
-add_dependencies(mixxx-lib mixxx-res)
+add_dependencies(mixxx-lib mixxx-res mixxx-script)
 
 # Windows-only resource file
 if(WIN32)
-- 
cgit v1.2.3