From 03f1f78be6b88503178d2048e6c6a99bf643035e Mon Sep 17 00:00:00 2001
From: falkTX <falktx@falktx.com>
Date: Tue, 4 Jul 2023 15:20:40 +0200
Subject: [PATCH] cmake: skip bin and lib install for macOS framework builds

Signed-off-by: falkTX <falktx@falktx.com>
---
 cmake/CMakeLists.txt | 44 ++++++++++++++++++++++++--------------------
 1 file changed, 24 insertions(+), 20 deletions(-)

diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt
index 6dde9056a5..2a60c57748 100644
--- a/cmake/CMakeLists.txt
+++ b/cmake/CMakeLists.txt
@@ -686,9 +686,11 @@ add_executable(carla-bridge-native)
 
 set_common_target_properties(carla-bridge-native)
 
-install(TARGETS carla-bridge-native
-  RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
-)
+if(NOT (APPLE AND ${CARLA_BUILD_FRAMEWORKS}))
+  install(TARGETS carla-bridge-native
+    RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+  )
+endif()
 
 target_compile_definitions(carla-bridge-native
   PRIVATE
@@ -774,9 +776,11 @@ add_executable(carla-discovery-native)
 
 set_common_target_properties(carla-discovery-native)
 
-install(TARGETS carla-discovery-native
-  RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
-)
+if(NOT (APPLE AND ${CARLA_BUILD_FRAMEWORKS}))
+  install(TARGETS carla-discovery-native
+    RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+  )
+endif()
 
 target_include_directories(carla-discovery-native
   PRIVATE
@@ -912,18 +916,18 @@ target_sources(carla-standalone
     ${carla-standalone-public-headers}
 )
 
-install(TARGETS carla-standalone
-  ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}/carla
-  LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/carla
-  FRAMEWORK DESTINATION ${CMAKE_INSTALL_LIBDIR}
-  RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
-)
-
 if(APPLE AND ${CARLA_BUILD_FRAMEWORKS})
   install(TARGETS
     carla-bridge-native
     carla-discovery-native
     DESTINATION ${CMAKE_INSTALL_LIBDIR}/carla-standalone.framework)
+else()
+  install(TARGETS carla-standalone
+    ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}/carla
+    LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/carla
+    FRAMEWORK DESTINATION ${CMAKE_INSTALL_LIBDIR}
+    RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+  )
 endif()
 
 #######################################################################################################################
@@ -1013,18 +1017,18 @@ target_sources(carla-utils
     ${carla-utils-public-headers}
 )
 
-install(TARGETS carla-utils
-  ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}/carla
-  LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/carla
-  RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
-  FRAMEWORK DESTINATION ${CMAKE_INSTALL_LIBDIR}
-)
-
 if(APPLE AND ${CARLA_BUILD_FRAMEWORKS})
   install(TARGETS
     carla-bridge-native
     carla-discovery-native
     DESTINATION ${CMAKE_INSTALL_LIBDIR}/carla-utils.framework)
+else()
+  install(TARGETS carla-utils
+    ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}/carla
+    LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/carla
+    RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+    FRAMEWORK DESTINATION ${CMAKE_INSTALL_LIBDIR}
+  )
 endif()
 
 #######################################################################################################################