clap

commit 43969b12f8b3d21b6e29c9dad3fe51adb5da84e3
parent bd790842be2c8e4bb4fbfbf9382e3a7ec9c8dcb3
Author: Alexandre BIQUE <bique.alexandre@gmail.com>
Date:   Mon, 30 Aug 2021 21:51:26 +0200

Fix make install and path provider

Diffstat:
M
.gitignore
 | 
3
++-
M
examples/plugins/CMakeLists.txt
 | 
5
+++--
M
examples/plugins/path-provider.cc
 | 
6
+++---
R
examples/plugins/dc-offset/skin/main.qml -> examples/plugins/qml/dc-offset/main.qml
 | 
0

4 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/.gitignore b/.gitignore
@@ -46,6 +46,8 @@ CMakeSettings.json
 .vscode
 .cache
 
+# C++ IDE helpers
+compile_commands.json
 
 # IntelliJ IDEA
 .idea
@@ -54,6 +56,5 @@ CMakeSettings.json
 build/
 cmake-build-*/
 
-
 # A place to store stuff and get it git ignored
 ignore/*
diff --git a/examples/plugins/CMakeLists.txt b/examples/plugins/CMakeLists.txt
@@ -26,4 +26,5 @@ target_link_libraries(clap-plugins -Wl,--version-script=${CMAKE_CURRENT_SOURCE_D
 target_link_libraries(clap-plugins -Wl,-z,defs)
 set_target_properties(clap-plugins PROPERTIES CXX_STANDARD 20 SUFFIX ".clap" PREFIX "")
 
-install(TARGETS clap-plugins DESTINATION "${CMAKE_INSTALL_PREFIX}/lib/clap")
-\ No newline at end of file
+install(TARGETS clap-plugins DESTINATION "${CMAKE_INSTALL_PREFIX}/lib/clap")
+install(DIRECTORY qml DESTINATION "${CMAKE_INSTALL_PREFIX}/lib/clap")
+\ No newline at end of file
diff --git a/examples/plugins/path-provider.cc b/examples/plugins/path-provider.cc
@@ -22,9 +22,9 @@ namespace clap {
 
       std::string getGuiExecutable() const override { return prefix_ / "bin/clap-gui"; }
 
-      std::string getSkinDirectory() const override { return prefix_ / "lib/clap/" / pluginName_ / "skin"; }
+      std::string getSkinDirectory() const override { return prefix_ / "lib/clap/qml" / pluginName_; }
 
-      std::string getQmlLibDirectory() const override { return prefix_ / "lib/clap" / pluginName_ / "qml"; }
+      std::string getQmlLibDirectory() const override { return prefix_ / "lib/clap/qml"; }
 
       bool isValid() const noexcept override { return !prefix_.empty(); }
 
@@ -59,7 +59,7 @@ namespace clap {
 
       std::string getGuiExecutable() const override { return buildRoot_ / "examples/gui/clap-gui"; }
 
-      std::string getSkinDirectory() const override { return srcRoot_ / "examples/plugins/" / pluginName_ / "skin"; }
+      std::string getSkinDirectory() const override { return srcRoot_ / "examples/plugins/qml" / pluginName_; }
 
       std::string getQmlLibDirectory() const override { return srcRoot_ / "examples/plugins/qml"; }
 
diff --git a/examples/plugins/dc-offset/skin/main.qml b/examples/plugins/qml/dc-offset/main.qml