From f6a1d394c25b96406466c5d6862f79202f383e3b Mon Sep 17 00:00:00 2001
From: Vladyslav Voinov <32337080+vvvar@users.noreply.github.com>
Date: Sat, 1 Jul 2023 20:01:48 +0200
Subject: [PATCH] =?UTF-8?q?Fix=20incorrect=20bundling=20of=20CLAP=20and=20?=
 =?UTF-8?q?LV2=20on=20macOS=20-=20they=20shall=20not=20be=20a=E2=80=A6=20(?=
 =?UTF-8?q?#91)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fix incorrect bundling of CLAP and LV2 on macOS - they shall not be a CFBundle
---
 CMakeLists.txt | 8 ++++----
 conanfile.py   | 2 +-
 justfile       | 1 -
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index fbb2589d..b6b2d053 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -102,10 +102,9 @@ if(APPLE)
     # Test we haven't missed any compiler options. Makes sense only on macOS at the moment
     add_test(NAME CompileOptions COMMAND python3 ${PROJECT_SOURCE_DIR}/test/test_compile_options.py --compile_commands=${CMAKE_BINARY_DIR}/compile_commands.json)
 
-    # Marks as CFBundle. Setting this globally because:
-    # 1. Without it, TARGET_BUNDLE_DIR won't work
-    # 2. TARGET_BUNDLE_DIR is used while bundling, signing and testing for macOS
-    set_target_properties(${CMAKE_PROJECT_NAME}_AU ${CMAKE_PROJECT_NAME}_CLAP ${CMAKE_PROJECT_NAME}_LV2 ${CMAKE_PROJECT_NAME}_VST3 PROPERTIES BUNDLE TRUE)
+    # Marks VST and AU as CFBundle. Without it, TARGET_BUNDLE_DIR won't work and we need it
+    # to get paths to sign and package them
+    set_target_properties(${CMAKE_PROJECT_NAME}_AU ${CMAKE_PROJECT_NAME}_VST3 PROPERTIES BUNDLE TRUE)
 
     # Test VST3 and AU with Pluginval
     add_test(NAME Pluginval_VST3
@@ -160,6 +159,7 @@ if(APPLE)
 else()
     # The way of getting path to .vst3 is tricky since actual bin is inside ARCHIVE_OUTPUT_DIRECTORY
     set(_VST3_BUNDLE "$<GENEX_EVAL:$<TARGET_PROPERTY:${CMAKE_PROJECT_NAME}_VST3,ARCHIVE_OUTPUT_DIRECTORY>>/${CMAKE_PROJECT_NAME}.vst3")
+
     # Getting it like this since lv2 folder is not a bundle, so TARGET_BUNDLE_DIR wont work
     get_target_property(_LV2_OUT_DIR ${CMAKE_PROJECT_NAME}_LV2 LIBRARY_OUTPUT_DIRECTORY)
 
diff --git a/conanfile.py b/conanfile.py
index e755a9c4..c8cc997f 100644
--- a/conanfile.py
+++ b/conanfile.py
@@ -5,7 +5,7 @@
 
 class PeakEater(ConanFile):
     name = "peakeater"
-    version = "0.7.0"
+    version = "0.7.1"
     user = "vvvar"
     channel = "testing"
     company = "T-Audio"
diff --git a/justfile b/justfile
index bed38131..841b03ac 100644
--- a/justfile
+++ b/justfile
@@ -28,7 +28,6 @@ cleanup:
     rm -rf test/build
     rm -f test/CMakeUserPresets.json
     rm -rf Testing
-    rm -rf ~/.conan2/p
     rm -f config/system/requirements.macos.brew.rb.lock.json
 
 # Cleanup build, temp and all generated files