Address Copilot review feedback

- Use absolute paths for headers exported to parent scope
- Include C++ headers in framework when ENABLE_CXX_INTERFACE is on

Author: revmischa

src/api/CMakeLists.txt

@@ -14,18 +14,18 @@ generate_export_header(projectM_api
 set(PROJECTM_PUBLIC_HEADERS
         "${PROJECTM_EXPORT_HEADER}"
         "${CMAKE_CURRENT_BINARY_DIR}/include/projectM-4/version.h"
-        include/projectM-4/audio.h
-        include/projectM-4/callbacks.h
-        include/projectM-4/core.h
-        include/projectM-4/debug.h
-        include/projectM-4/logging.h
-        include/projectM-4/memory.h
-        include/projectM-4/parameters.h
-        include/projectM-4/projectM.h
-        include/projectM-4/render_opengl.h
-        include/projectM-4/touch.h
-        include/projectM-4/types.h
-        include/projectM-4/user_sprites.h
+        "${CMAKE_CURRENT_SOURCE_DIR}/include/projectM-4/audio.h"
+        "${CMAKE_CURRENT_SOURCE_DIR}/include/projectM-4/callbacks.h"
+        "${CMAKE_CURRENT_SOURCE_DIR}/include/projectM-4/core.h"
+        "${CMAKE_CURRENT_SOURCE_DIR}/include/projectM-4/debug.h"
+        "${CMAKE_CURRENT_SOURCE_DIR}/include/projectM-4/logging.h"
+        "${CMAKE_CURRENT_SOURCE_DIR}/include/projectM-4/memory.h"
+        "${CMAKE_CURRENT_SOURCE_DIR}/include/projectM-4/parameters.h"
+        "${CMAKE_CURRENT_SOURCE_DIR}/include/projectM-4/projectM.h"
+        "${CMAKE_CURRENT_SOURCE_DIR}/include/projectM-4/render_opengl.h"
+        "${CMAKE_CURRENT_SOURCE_DIR}/include/projectM-4/touch.h"
+        "${CMAKE_CURRENT_SOURCE_DIR}/include/projectM-4/types.h"
+        "${CMAKE_CURRENT_SOURCE_DIR}/include/projectM-4/user_sprites.h"
         )
 
 if(ENABLE_CXX_INTERFACE)

src/libprojectM/CMakeLists.txt

@@ -110,13 +110,24 @@ if(BUILD_SHARED_LIBS)
             )
 
     if(ENABLE_MACOS_FRAMEWORK)
+        # Start with C API headers
+        set(_framework_public_headers ${PROJECTM_PUBLIC_HEADERS})
+
+        # Add C++ headers when the C++ interface is enabled
+        if(ENABLE_CXX_INTERFACE)
+            list(APPEND _framework_public_headers
+                    "${CMAKE_CURRENT_SOURCE_DIR}/Audio/PCM.hpp"
+                    "${CMAKE_CURRENT_SOURCE_DIR}/ProjectM.hpp"
+                    )
+        endif()
+
         set_target_properties(projectM PROPERTIES
                 FRAMEWORK TRUE
                 FRAMEWORK_VERSION A
                 MACOSX_FRAMEWORK_IDENTIFIER com.github.projectm-visualizer.projectM
                 MACOSX_FRAMEWORK_SHORT_VERSION_STRING "${PROJECT_VERSION}"
                 MACOSX_FRAMEWORK_BUNDLE_VERSION "${PROJECT_VERSION}"
-                PUBLIC_HEADER "${PROJECTM_PUBLIC_HEADERS}"
+                PUBLIC_HEADER "${_framework_public_headers}"
                 )
     endif()
 else()