Skip to content

build: Fix invalid elseif syntax in Apple platform checks - #16058

Merged
daschuer merged 1 commit into
mixxxdj:2.5from
xARSENICx:fix-cmake-apple-else
Feb 28, 2026
Merged

build: Fix invalid elseif syntax in Apple platform checks#16058
daschuer merged 1 commit into
mixxxdj:2.5from
xARSENICx:fix-cmake-apple-else

Conversation

@xARSENICx

Copy link
Copy Markdown
Contributor

No description provided.

@github-actions github-actions Bot added the build label Feb 27, 2026
@xARSENICx

Copy link
Copy Markdown
Contributor Author

The elseif() block showed warnings in my build.

@daschuer

Copy link
Copy Markdown
Member

This issue is also part of the 2.5 branch.
Can your rebase your fix to 2.5?

git rebsse --onto==upstream/2.5 HEAD~1
gif push -f

@xARSENICx

Copy link
Copy Markdown
Contributor Author

There's Merge Conflict:

diff --cc CMakeLists.txt
index 7b016e3043,8e7b124935..0000000000
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@@ -3236,13 -4337,11 +3236,21 @@@ if(APPLE
          "-weak_framework VideoToolbox"
      )
      if(IOS)
++<<<<<<< HEAD
 +      target_link_libraries(mixxx-lib PRIVATE
 +        "-weak_framework UIKit"
 +      )
 +    elseif()
 +      target_link_libraries(mixxx-lib PRIVATE
 +        "-weak_framework AppKit"
 +        "-weak_framework AudioUnit"
++=======
+       target_link_libraries(mixxx-lib PRIVATE "-weak_framework UIKit")
+     else()
+       target_link_libraries(
+         mixxx-lib
+         PRIVATE "-weak_framework AppKit" "-weak_framework AudioUnit"
++>>>>>>> 4e28df9333 (build: Fix invalid elseif syntax in Apple platform checks)
        )
      endif()
    else()

@daschuer

Copy link
Copy Markdown
Member

Ups, yes the resoultion is:

        "-weak_framework VideoToolbox"
    )
    if(IOS)
      target_link_libraries(mixxx-lib PRIVATE
        "-weak_framework UIKit"
      )
    else()
      target_link_libraries(mixxx-lib PRIVATE
        "-weak_framework AppKit"
        "-weak_framework AudioUnit"
      )
    endif()
  else()

Or just revert everything and edit this line new.

In general you see the original above and the new edit below. In more complex cases I highly recommend to use a graphical UI div editor. I have good experience with SmartGit.

@daschuer daschuer left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, thank you.

@daschuer
daschuer merged commit 926e7e3 into mixxxdj:2.5 Feb 28, 2026
15 checks passed
@xARSENICx
xARSENICx deleted the fix-cmake-apple-else branch March 2, 2026 11:54
@github-project-automation github-project-automation Bot moved this to In progress in Releases Mar 5, 2026
@github-project-automation github-project-automation Bot moved this from In progress to Done in Releases Mar 5, 2026
@acolombier acolombier added this to the 2.5.5 milestone Mar 5, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

Status: Done

Development

Successfully merging this pull request may close these issues.

3 participants