From fb27900e94c53b36cd9e7f5a2748b81a23cd1c84 Mon Sep 17 00:00:00 2001 From: PatTheMav Date: Sat, 21 Nov 2020 17:29:32 +0100 Subject: [PATCH] CI: Remove explicit LANGUAGE flags for cmake 3.19+ --- libobs-opengl/CMakeLists.txt | 4 ---- libobs/CMakeLists.txt | 1 - plugins/mac-capture/CMakeLists.txt | 5 ----- plugins/mac-syphon/CMakeLists.txt | 3 --- plugins/text-freetype2/CMakeLists.txt | 3 --- 5 files changed, 16 deletions(-) diff --git a/libobs-opengl/CMakeLists.txt b/libobs-opengl/CMakeLists.txt index c2fa4fd67..aa25d74ff 100644 --- a/libobs-opengl/CMakeLists.txt +++ b/libobs-opengl/CMakeLists.txt @@ -16,10 +16,6 @@ elseif(APPLE) set(libobs-opengl_PLATFORM_SOURCES gl-cocoa.m) - set_source_files_properties(${libobs-opengl_PLATFORM_SOURCES} - PROPERTIES - LANGUAGE C) - find_library(COCOA Cocoa) include_directories(${COCOA}) mark_as_advanced(COCOA) diff --git a/libobs/CMakeLists.txt b/libobs/CMakeLists.txt index 2753f48dc..3d3733f2d 100644 --- a/libobs/CMakeLists.txt +++ b/libobs/CMakeLists.txt @@ -143,7 +143,6 @@ elseif(APPLE) set_source_files_properties(${libobs_PLATFORM_SOURCES} PROPERTIES - LANGUAGE C COMPILE_FLAGS "-fobjc-arc") find_library(COCOA Cocoa) diff --git a/plugins/mac-capture/CMakeLists.txt b/plugins/mac-capture/CMakeLists.txt index 66f1a1889..851f9f1c0 100644 --- a/plugins/mac-capture/CMakeLists.txt +++ b/plugins/mac-capture/CMakeLists.txt @@ -24,11 +24,6 @@ set(mac-capture_SOURCES mac-window-capture.m window-utils.m) -set_source_files_properties(mac-display-capture.m - mac-window-capture.m - window-utils.m - PROPERTIES LANGUAGE C) - add_library(mac-capture MODULE ${mac-capture_SOURCES} ${mac-capture_HEADERS}) diff --git a/plugins/mac-syphon/CMakeLists.txt b/plugins/mac-syphon/CMakeLists.txt index e203136e2..d8a3a5b4f 100644 --- a/plugins/mac-syphon/CMakeLists.txt +++ b/plugins/mac-syphon/CMakeLists.txt @@ -65,9 +65,6 @@ set(mac-syphon_SOURCES syphon.m plugin-main.c) -set_source_files_properties(${mac-syphon_SOURCES} ${syphon_SOURCES} - PROPERTIES LANGUAGE C) - add_definitions(-DSYPHON_UNIQUE_CLASS_NAME_PREFIX=OBS_ -include ${PROJECT_SOURCE_DIR}/syphon-framework/Syphon_Prefix.pch) diff --git a/plugins/text-freetype2/CMakeLists.txt b/plugins/text-freetype2/CMakeLists.txt index 5b4e1e5dd..c561d444c 100644 --- a/plugins/text-freetype2/CMakeLists.txt +++ b/plugins/text-freetype2/CMakeLists.txt @@ -42,9 +42,6 @@ elseif(APPLE) set(text-freetype2_PLATFORM_DEPS ${COCOA} ${ICONV_LIBRARIES}) - - set_source_files_properties(find-font-cocoa.m - PROPERTIES LANGUAGE C) else() find_package(Fontconfig QUIET) if(NOT FONTCONFIG_FOUND AND ENABLE_FREETYPE)