macos: improve cmake build

yestalgia · Jun 8, 2024 · 9702cb0 · 9702cb0
1 parent abeec90
commit 9702cb0
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 4 deletions.
diff --git a/fixtureeditor/CMakeLists.txt b/fixtureeditor/CMakeLists.txt
@@ -19,7 +19,7 @@ else()
     qt5_add_translation(QM_FILES ${TS_FILES})
 endif()
 
-add_executable(${module_name} WIN32 MACOSX_BUNDLE
+add_executable(${module_name} WIN32
     ../ui/src/aboutbox.cpp ../ui/src/aboutbox.h ../ui/src/aboutbox.ui
     ../ui/src/apputil.cpp ../ui/src/apputil.h
     ../ui/src/docbrowser.cpp ../ui/src/docbrowser.h

diff --git a/launcher/CMakeLists.txt b/launcher/CMakeLists.txt
@@ -19,7 +19,7 @@ else()
     qt5_add_translation(QM_FILES ${TS_FILES})
 endif()
 
-add_executable(${module_name} MACOSX_BUNDLE
+add_executable(${module_name}
     launcher.cpp launcher.h
     main.cpp
     ${QM_FILES}

diff --git a/main/CMakeLists.txt b/main/CMakeLists.txt
@@ -1,6 +1,6 @@
 set(module_name "qlcplus")
 
-add_executable(${module_name} WIN32 MACOSX_BUNDLE
+add_executable(${module_name} WIN32
     main.cpp
 )
 

diff --git a/platforms/CMakeLists.txt b/platforms/CMakeLists.txt
@@ -6,3 +6,6 @@ endif()
 if(WIN32)
     add_subdirectory(windows)
 endif()
+if(APPLE)
+    add_subdirectory(macos)
+endif()
diff --git a/platforms/macos/CMakeLists.txt b/platforms/macos/CMakeLists.txt
@@ -0,0 +1,16 @@
+cmake_minimum_required(VERSION 3.16)
+project(icons VERSION 1.0 LANGUAGES C CXX)
+
+#set(CMAKE_INCLUDE_CURRENT_DIR ON)
+include(../../variables.cmake)
+
+# install macOS files for a correct bundle
+install(FILES qt.conf DESTINATION ${INSTALLROOT}/${DATADIR})
+install(FILES ../../resources/icons/qlcplus.icns DESTINATION ${INSTALLROOT})
+
+if(qmlui)
+    install(FILES Info.plist.qmlui DESTINATION ${INSTALLROOT}/Info.plist)
+else()
+    install(FILES Info.plist DESTINATION ${INSTALLROOT})
+endif()
+install(CODE "execute_process(COMMAND sed -i -e \"s/__QLC_VERSION__/${APPVERSION}/g\" ${INSTALLROOT}/Info.plist)")
diff --git a/qmlui/CMakeLists.txt b/qmlui/CMakeLists.txt
@@ -88,7 +88,7 @@ if(ANDROID)
         ${module_name}
         PROPERTIES LIBRARY_OUTPUT_NAME qlcplus)
 else()
-    add_executable(${module_name} WIN32 MACOSX_BUNDLE
+    add_executable(${module_name} WIN32
         ${SRC_FILES}
         ${QM_FILES}
     )