cmake: fix platform detection on macOS

mcallegari · Jul 31, 2023 · ef2dd59 · ef2dd59
1 parent 1c16674
commit ef2dd59
Show file tree

Hide file tree

Showing 14 changed files with 24 additions and 24 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -13,7 +13,7 @@ SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
 SET(INSTALL_ROOT "/" CACHE STRING "Installation root directory")
 
 if(UNIX)
-    if (MACOS)
+    if (APPLE)
         set(iokit ON)
     else()
         set(udev ON)
@@ -42,7 +42,7 @@ find_package(PkgConfig REQUIRED)
 include(./variables.cmake)
 include(./coverage.cmake)
 
-if((((QT_VERSION_MAJOR LESS 5)) AND (MACOS)))
+if((((QT_VERSION_MAJOR LESS 5)) AND (APPLE)))
     pkg_check_modules(PORTAUDIO_2 IMPORTED_TARGET portaudio-2.0)
 endif()
 
@@ -65,7 +65,7 @@ else()
     add_subdirectory(main)
     add_subdirectory(fixtureeditor)
 endif()
-if(MACOS AND NOT qmlui)
+if(APPLE AND NOT qmlui)
     add_subdirectory(launcher)
 endif()
 

diff --git a/engine/audio/src/CMakeLists.txt b/engine/audio/src/CMakeLists.txt
@@ -20,7 +20,7 @@ target_link_libraries(${module_name} PUBLIC
     Qt${QT_MAJOR_VERSION}::Multimedia
 )
 
-if(MACOS)
+if(APPLE)
     set_target_properties(${module_name} PROPERTIES
         MACOSX_BUNDLE FALSE
     )
@@ -32,7 +32,7 @@ if(WIN32)
     )
 endif()
 
-if(((QT_VERSION_MAJOR LESS 5)) AND (UNIX AND NOT MACOS))
+if(((QT_VERSION_MAJOR LESS 5)) AND (UNIX AND NOT APPLE))
     target_sources(${module_name} PRIVATE
         audiocapture_alsa.cpp audiocapture_alsa.h
         audiorenderer_alsa.cpp audiorenderer_alsa.h
@@ -60,7 +60,7 @@ if(NOT ((QT_VERSION_MAJOR LESS 6)))
     )
 endif()
 
-if((((QT_VERSION_MAJOR LESS 5)) AND (MACOS)))
+if((((QT_VERSION_MAJOR LESS 5)) AND (APPLE)))
     if (${PORTAUDIO_2_FOUND})
         target_sources(${module_name} PRIVATE
             audiocapture_portaudio.cpp audiocapture_portaudio.h
@@ -90,7 +90,7 @@ if((NOT ANDROID AND NOT IOS) AND (${FFTW3_FOUND}))
     )
 endif()
 
-if(UNIX AND NOT ANDROID AND NOT IOS AND NOT MACOS)
+if(UNIX AND NOT ANDROID AND NOT IOS AND NOT APPLE)
     target_link_libraries(${module_name} PUBLIC
         asound
     )

diff --git a/engine/src/CMakeLists.txt b/engine/src/CMakeLists.txt
@@ -99,7 +99,7 @@ if(NOT ANDROID AND NOT IOS)
     )
 endif()
 
-if(UNIX AND NOT ANDROID AND NOT IOS AND NOT MACOS)
+if(UNIX AND NOT ANDROID AND NOT IOS AND NOT APPLE)
     target_link_libraries(${module_name} PUBLIC
         asound
     )
@@ -127,7 +127,7 @@ if((NOT ANDROID AND NOT IOS) AND (iokit))
     )
 endif()
 
-if(MACOS)
+if(APPLE)
     set_target_properties(${module_name} PROPERTIES
         MACOSX_BUNDLE FALSE
     )

diff --git a/engine/test/efx/CMakeLists.txt b/engine/test/efx/CMakeLists.txt
@@ -16,7 +16,7 @@ target_link_libraries(efx_test PRIVATE
     qlcplusengine
 )
 
-if(MACOS)
+if(APPLE)
     set_target_properties(efx_test PROPERTIES
         MACOSX_BUNDLE FALSE
     )

diff --git a/main/CMakeLists.txt b/main/CMakeLists.txt
@@ -28,7 +28,7 @@ if(QT_VERSION_MAJOR EQUAL 5)
     )
 endif()
 
-if(WIN32 OR MACOS)
+if(WIN32 OR APPLE)
     target_sources(${module_name} PRIVATE
         ../ui/src/debugbox.cpp ../ui/src/debugbox.h ../ui/src/debugbox.ui
     )

diff --git a/platforms/CMakeLists.txt b/platforms/CMakeLists.txt
@@ -1,6 +1,6 @@
 project(platforms)
 
-if(UNIX AND NOT MACOS)
+if(UNIX AND NOT APPLE)
     add_subdirectory(linux)
 endif()
 if(WIN32)

diff --git a/plugins/CMakeLists.txt b/plugins/CMakeLists.txt
@@ -20,7 +20,7 @@ if(NOT ANDROID AND NOT IOS)
     add_subdirectory(enttecwing)
     add_subdirectory(hid)
     add_subdirectory(os2l)
-if(UNIX AND NOT MACOS)
+if(UNIX AND NOT APPLE)
     add_subdirectory(dmx4linux)
 endif()
 if (NOT WIN32 AND NOT APPLE)

diff --git a/plugins/dmxusb/src/CMakeLists.txt b/plugins/dmxusb/src/CMakeLists.txt
@@ -52,7 +52,7 @@ if(UNIX)
         target_link_libraries(${module_name} PRIVATE ${LIBFTDI1_LIBRARIES})
 
         if (APPLE)
-            include(../../../platforms/macos/nametool.pri)
+            #include(../../../platforms/macos/nametool.pri)
             add_custom_command(TARGET ${module_name}
                 COMMAND ${PKG_CONFIG_NAMETOOL} libusb-1.0 libusb-1.0.0.dylib
                 COMMAND ${PKG_CONFIG_NAMETOOL} libftdi1 libftdi1.2.dylib

diff --git a/plugins/hid/CMakeLists.txt b/plugins/hid/CMakeLists.txt
@@ -41,7 +41,7 @@ target_link_libraries(${module_name} PRIVATE
     Qt${QT_MAJOR_VERSION}::Widgets
 )
 
-if(UNIX AND NOT MACOS)
+if(UNIX AND NOT APPLE)
     target_sources(${module_name} PRIVATE
         linux/hidapi.cpp
         linux/hidlinuxjoystick.cpp linux/hidlinuxjoystick.h
@@ -52,7 +52,7 @@ if(UNIX AND NOT MACOS)
     )
 endif()
 
-if(MACOS)
+if(APPLE)
     target_sources(${module_name} PRIVATE
         macx/hidapi.cpp
         macx/hidosxjoystick.cpp macx/hidosxjoystick.h

diff --git a/plugins/midi/src/CMakeLists.txt b/plugins/midi/src/CMakeLists.txt
@@ -1,9 +1,9 @@
 project(src)
 
-if(MACOS)
+if(APPLE)
     add_subdirectory(macx)
 endif()
-if(UNIX AND NOT MACOS)
+if(UNIX AND NOT APPLE)
     add_subdirectory(alsa)
 endif()
 if(WIN32)

diff --git a/plugins/ola/CMakeLists.txt b/plugins/ola/CMakeLists.txt
@@ -41,7 +41,7 @@ target_link_libraries(${module_name} PRIVATE
     Qt${QT_MAJOR_VERSION}::Widgets
 )
 
-if(MACOS)
+if(APPLE)
     set_target_properties(${module_name} PROPERTIES
         MACOSX_BUNDLE FALSE
     )
@@ -71,7 +71,7 @@ if(MACOS)
     endif()
 endif()
 
-if(NOT MACOS)
+if(NOT APPLE)
     target_link_libraries(${module_name} PRIVATE
         # Remove: L/usr/local/lib
         ola

diff --git a/plugins/peperoni/common/CMakeLists.txt b/plugins/peperoni/common/CMakeLists.txt
@@ -30,7 +30,7 @@ if(WIN32)
     )
 endif()
 
-if(MACOS)
+if(APPLE)
     set_target_properties(common PROPERTIES
         MACOSX_BUNDLE FALSE
     )

diff --git a/ui/src/CMakeLists.txt b/ui/src/CMakeLists.txt
@@ -19,7 +19,7 @@ else()
     qt5_add_translation(QM_FILES ${TS_FILES})
 endif()
 
-if((((QT_VERSION_MAJOR LESS 5)) AND (MACOS)))
+if((((QT_VERSION_MAJOR LESS 5)) AND (APPLE)))
     if (${PORTAUDIO_2_FOUND})
         target_compile_definitions(${module_name} PUBLIC
             HAS_PORTAUDIO

diff --git a/webaccess/src/CMakeLists.txt b/webaccess/src/CMakeLists.txt
@@ -19,7 +19,7 @@ else()
     qt5_add_translation(QM_FILES ${TS_FILES})
 endif()
 
-if((((QT_VERSION_MAJOR LESS 5)) AND (MACOS)))
+if((((QT_VERSION_MAJOR LESS 5)) AND (APPLE)))
     if (${PORTAUDIO_2_FOUND})
         target_compile_definitions(${module_name} PUBLIC
             HAS_PORTAUDIO
@@ -96,7 +96,7 @@ if(WIN32)
     )
 endif()
 
-if(UNIX AND NOT MACOS)
+if(UNIX AND NOT APPLE)
     target_sources(${module_name} PRIVATE
         webaccessnetwork.cpp webaccessnetwork.h
     )