Fixup MacOS builds -- must use Xcode generator

Author: cboulay

CMakeLists.txt

@@ -1,13 +1,38 @@
-cmake_minimum_required(VERSION 3.5)
+cmake_minimum_required(VERSION 3.12)
+set(CMAKE_OSX_DEPLOYMENT_TARGET "10.15" CACHE STRING "Minimum MacOS deployment version")
 
 project(AudioCapture
     DESCRIPTION "Capture audio and stream it over LabStreamingLayer"
     HOMEPAGE_URL "https://github.com/labstreaminglayer/App-AudioCapture/"
     LANGUAGES CXX C
     VERSION 0.1)
 
-# Find an installed liblsl in paths set by the user (LSL_INSTALL_ROOT)
-# and some default paths
+# Needed for customized MacOSXBundleInfo.plist.in
+SET(CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/cmake" ${CMAKE_MODULE_PATH})
+
+set(CMAKE_CXX_STANDARD 17)
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
+
+
+## Qt
+set(CMAKE_AUTOMOC ON)  # The later version of this in LSLCMake is somehow not enough.
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+find_package(Qt6 COMPONENTS Core Widgets Network DBus Multimedia)  # Multimedia requires Qt6.2
+if(NOT Qt6_FOUND)
+	if(APPLE)
+		list(APPEND CMAKE_PREFIX_PATH "/usr/local/opt/qt@5")
+	endif()
+	# If we require 5.15 then we can use version-agnostic linking, but 5.15 not easily available on Ubuntu.
+	find_package(Qt5 COMPONENTS Core Widgets Network DBus Multimedia REQUIRED)
+	add_executable(${PROJECT_NAME} MACOSX_BUNDLE)
+	set(LSLAPP_QT_VER Qt5)
+else()
+	qt_add_executable(${PROJECT_NAME} MACOSX_BUNDLE MANUAL_FINALIZATION)
+	set(LSLAPP_QT_VER Qt)
+endif()
+
+# LSL
 find_package(LSL REQUIRED
     HINTS ${LSL_INSTALL_ROOT}
     "${CMAKE_CURRENT_LIST_DIR}/../../LSL/liblsl/build/"
@@ -16,16 +41,10 @@ find_package(LSL REQUIRED
     "${CMAKE_CURRENT_LIST_DIR}/../../LSL/liblsl/out/install/x64-Release"
     PATH_SUFFIXES share/LSL)
 get_filename_component(LSL_PATH ${LSL_CONFIG} DIRECTORY)
-message(STATUS "Found LSL lib in ${LSL_PATH}")
 
-set(CMAKE_INCLUDE_CURRENT_DIR ON)
-set(CMAKE_AUTOMOC ON)
-set(CMAKE_AUTOUIC ON)
-set(CMAKE_AUTORCC ON)
-find_package(Qt5 REQUIRED COMPONENTS Widgets Multimedia)
 find_package(Threads REQUIRED)
 
-add_executable(${PROJECT_NAME} MACOSX_BUNDLE WIN32
+target_sources(${PROJECT_NAME} PRIVATE
     main.cpp
     mainwindow.cpp
     mainwindow.h
@@ -36,28 +55,26 @@ add_executable(${PROJECT_NAME} MACOSX_BUNDLE WIN32
 
 target_link_libraries(${PROJECT_NAME}
     PRIVATE
-    Qt5::Widgets
-    Qt5::Multimedia
+    ${LSLAPP_QT_VER}::Widgets
+    ${LSLAPP_QT_VER}::Multimedia
     Threads::Threads
     LSL::lsl
 )
-set_property(TARGET ${PROJECT_NAME} PROPERTY CXX_STANDARD 14)
-# target_compile_features(${PROJECT_NAME} PRIVATE cxx_auto_type cxx_lambda_init_captures)
-
 
+set(CMAKE_XCODE_ATTRIBUTE_CODE_SIGNING_ALLOWED "NO")
 set_target_properties(${PROJECT_NAME} PROPERTIES
-    MACOSX_BUNDLE_INFO_PLIST "${CMAKE_CURRENT_LIST_DIR}/MacOSXBundleInfo.plist"
-    MACOSX_BUNDLE_GUI_IDENTIFIER "LabStreamingLayer.AudioCapture")
+	XCODE_ATTRIBUTE_CODE_SIGNING_REQUIRED "NO"
+)
 
 # Copy the required dll's into the build folder --> useful for debugging from IDE
 # create a list of files to copy
 set(THIRD_PARTY_DLLS
    LSL::lsl
-   Qt5::Core
-   Qt5::Gui
-   Qt5::Widgets
-   Qt5::Multimedia
-   Qt5::Network
+   ${LSLAPP_QT_VER}::Core
+   ${LSLAPP_QT_VER}::Gui
+   ${LSLAPP_QT_VER}::Widgets
+   ${LSLAPP_QT_VER}::Multimedia
+   ${LSLAPP_QT_VER}::Network
 )
 
 foreach(_lib ${THIRD_PARTY_DLLS})
@@ -67,5 +84,9 @@ foreach(_lib ${THIRD_PARTY_DLLS})
             $<TARGET_FILE_DIR:${PROJECT_NAME}>)
 endforeach()
 
+if(Qt6_FOUND)
+	qt_finalize_executable(${PROJECT_NAME})
+endif()
+
 installLSLApp(${PROJECT_NAME})
 LSLGenerateCPackConfig()

README.md

@@ -23,8 +23,10 @@ Using this app is very simple:
 # Build
 
 The build instructions for this app are mostly the same as the [generic LSL App build instructions](https://labstreaminglayer.readthedocs.io/dev/app_build.html).
-Qt5 Multimedia module is required. On Ubuntu this does not come with qt5 by default. Install it with `sudo apt-get install qtmultimedia5-dev`.
+Qt Multimedia module is required. On Ubuntu this does not come with qt5 by default. Install it with `sudo apt-get install qtmultimedia5-dev`. On Mac, with homebrew, it is only included in qt6 >= 6.2, which isn't out yet, so qt5 is required.
+On Mac, it appears to be necessary to use the Xcode generator: `cmake -B build -S . -DCMAKE_INSTALL_PREFIX="build/install" -G Xcode`
 
+Note that code-signing has been disabled.
 
 # Further Notes
 

MacOSXBundleInfo.plist cmake/MacOSXBundleInfo.plistMacOSXBundleInfo.plist renamed to cmake/MacOSXBundleInfo.plist

@@ -28,9 +28,15 @@
 	<string>${MACOSX_BUNDLE_BUNDLE_VERSION}</string>
 	<key>CSResourcesFileMapped</key>
 	<true/>
+	<key>LSRequiresCarbon</key>
+	<true/>
 	<key>NSHumanReadableCopyright</key>
 	<string>${MACOSX_BUNDLE_COPYRIGHT}</string>
+	<key>NSHighResolutionCapable</key>
+	<true/>
 	<key>NSMicrophoneUsageDescription</key>
 	<string>Copy audio to LSL stream.</string>
+	<key>NSPrincipalClass</key>
+	<string>NSApplication</string>
 </dict>
 </plist>