Fix review issues in macOS framework build

- Add missing Renderer/TextureTypes.hpp to C++ framework headers
- Skip pkg-config generation for playlist in framework mode
- Use stored framework path property for install instead of TARGET_FILE_DIR
- Show compiler errors on linkability test failure instead of suppressing
- Fix comment about framework output location

Author: Mischa

cmake/MacOSFramework.cmake

@@ -19,7 +19,7 @@
 #       [HEADER_SUBDIR <subdirectory name under Headers, defaults to FRAMEWORK_NAME>]
 #   )
 #
-# The framework will be created in the same directory as the target's output.
+# The framework will be created in CMAKE_CURRENT_BINARY_DIR.
 # C_HEADERS are installed flat under Headers/<header-subdir>/
 # CXX_HEADERS preserve their directory structure relative to HEADER_BASE_DIR.
 #
@@ -175,7 +175,7 @@ function(create_macos_framework)
 
     # Set properties on the framework target for use by install commands
     set_target_properties(${FW_TARGET} PROPERTIES
-        MACOS_FRAMEWORK_LOCATION "${_framework_dir}"
+        MACOS_FRAMEWORK_OUTPUT_DIR "${_framework_dir}"
         MACOS_FRAMEWORK_NAME "${FW_FRAMEWORK_NAME}"
     )
 endfunction()
@@ -213,8 +213,9 @@ function(install_macos_framework)
         set(_component_arg COMPONENT ${FW_COMPONENT})
     endif()
 
+    get_target_property(_framework_dir ${FW_TARGET} MACOS_FRAMEWORK_OUTPUT_DIR)
     install(
-        DIRECTORY "$<TARGET_FILE_DIR:${FW_TARGET}>/${_framework_name}.framework"
+        DIRECTORY "${_framework_dir}"
         DESTINATION "${FW_DESTINATION}"
         ${_component_arg}
         USE_SOURCE_PERMISSIONS

scripts/test-macos-framework.sh

@@ -117,9 +117,11 @@ test_linkability() {
 
     echo "$test_code" > "$test_file"
 
-    if clang -F "$framework_parent" -I "$include_path" -framework "$framework_name" "$test_file" -o "$test_output" 2>/dev/null; then
+    local compile_errors
+    if compile_errors=$(clang -F "$framework_parent" -I "$include_path" -framework "$framework_name" "$test_file" -o "$test_output" 2>&1); then
         pass "Linkability test for $framework_name.framework"
     else
+        echo "$compile_errors"
         fail "Failed to compile and link against $framework_name.framework"
     fi
 }
@@ -194,12 +196,14 @@ int main() {
         TEMP_FILES+=("$test_file" "$test_output")
         echo "$PLAYLIST_TEST_CODE" > "$test_file"
 
-        if clang -F "$framework_parent" -F "$projectm_parent" \
+        compile_errors=""
+        if compile_errors=$(clang -F "$framework_parent" -F "$projectm_parent" \
               -I "$include_path" -I "$projectm_include_path" \
               -framework "projectM-4-playlist" -framework "projectM-4" \
-              "$test_file" -o "$test_output" 2>/dev/null; then
+              "$test_file" -o "$test_output" 2>&1); then
             pass "Linkability test for projectM-4-playlist.framework"
         else
+            echo "$compile_errors"
             fail "Failed to compile and link against projectM-4-playlist.framework"
         fi
     fi

src/libprojectM/CMakeLists.txt

@@ -151,6 +151,7 @@ if(BUILD_SHARED_LIBS)
                     "${CMAKE_CURRENT_SOURCE_DIR}/Audio/PCM.hpp"
                     "${CMAKE_CURRENT_SOURCE_DIR}/Audio/WaveformAligner.hpp"
                     "${CMAKE_CURRENT_SOURCE_DIR}/Renderer/RenderContext.hpp"
+                    "${CMAKE_CURRENT_SOURCE_DIR}/Renderer/TextureTypes.hpp"
                     "${CMAKE_CURRENT_SOURCE_DIR}/Logging.hpp"
                     "${CMAKE_CURRENT_SOURCE_DIR}/ProjectM.hpp"
                     )

src/playlist/CMakeLists.txt

@@ -166,8 +166,8 @@ if(ENABLE_INSTALL)
                 )
     endif()
 
-    # pkg-config export, only supported on UNIX systems.
-    if(UNIX)
+    # pkg-config export, only supported on UNIX systems (not for frameworks).
+    if(UNIX AND NOT ENABLE_MACOS_FRAMEWORK)
         include(GeneratePkgConfigFiles)
 
         if(ENABLE_BOOST_FILESYSTEM)