general: Remove inih
This commit is contained in:
		@@ -1,27 +0,0 @@
 | 
			
		||||
# SPDX-FileCopyrightText: 2022 Alexandre Bouvier <contact@amb.tf>
 | 
			
		||||
#
 | 
			
		||||
# SPDX-License-Identifier: GPL-3.0-or-later
 | 
			
		||||
 | 
			
		||||
find_package(PkgConfig QUIET)
 | 
			
		||||
pkg_search_module(INIH QUIET IMPORTED_TARGET inih)
 | 
			
		||||
if (INIReader IN_LIST inih_FIND_COMPONENTS)
 | 
			
		||||
    pkg_search_module(INIREADER QUIET IMPORTED_TARGET INIReader)
 | 
			
		||||
    if (INIREADER_FOUND)
 | 
			
		||||
        set(inih_INIReader_FOUND TRUE)
 | 
			
		||||
    endif()
 | 
			
		||||
endif()
 | 
			
		||||
 | 
			
		||||
include(FindPackageHandleStandardArgs)
 | 
			
		||||
find_package_handle_standard_args(inih
 | 
			
		||||
    REQUIRED_VARS INIH_LINK_LIBRARIES
 | 
			
		||||
    VERSION_VAR INIH_VERSION
 | 
			
		||||
    HANDLE_COMPONENTS
 | 
			
		||||
)
 | 
			
		||||
 | 
			
		||||
if (inih_FOUND AND NOT TARGET inih::inih)
 | 
			
		||||
    add_library(inih::inih ALIAS PkgConfig::INIH)
 | 
			
		||||
endif()
 | 
			
		||||
 | 
			
		||||
if (inih_FOUND AND inih_INIReader_FOUND AND NOT TARGET inih::INIReader)
 | 
			
		||||
    add_library(inih::INIReader ALIAS PkgConfig::INIREADER)
 | 
			
		||||
endif()
 | 
			
		||||
							
								
								
									
										5
									
								
								externals/CMakeLists.txt
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										5
									
								
								externals/CMakeLists.txt
									
									
									
									
										vendored
									
									
								
							@@ -34,11 +34,6 @@ endif()
 | 
			
		||||
# Glad
 | 
			
		||||
add_subdirectory(glad)
 | 
			
		||||
 | 
			
		||||
# inih
 | 
			
		||||
if (NOT TARGET inih::INIReader)
 | 
			
		||||
    add_subdirectory(inih)
 | 
			
		||||
endif()
 | 
			
		||||
 | 
			
		||||
# mbedtls
 | 
			
		||||
add_subdirectory(mbedtls)
 | 
			
		||||
target_include_directories(mbedtls PUBLIC ./mbedtls/include)
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										13
									
								
								externals/inih/CMakeLists.txt
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										13
									
								
								externals/inih/CMakeLists.txt
									
									
									
									
										vendored
									
									
								
							@@ -1,13 +0,0 @@
 | 
			
		||||
# SPDX-FileCopyrightText: 2014 Gui Andrade <admin@archshift.com>
 | 
			
		||||
# SPDX-License-Identifier: GPL-2.0-or-later
 | 
			
		||||
 | 
			
		||||
add_library(inih
 | 
			
		||||
    inih/ini.c
 | 
			
		||||
    inih/ini.h
 | 
			
		||||
    inih/cpp/INIReader.cpp
 | 
			
		||||
    inih/cpp/INIReader.h
 | 
			
		||||
)
 | 
			
		||||
 | 
			
		||||
create_target_directory_groups(inih)
 | 
			
		||||
target_include_directories(inih INTERFACE inih/cpp)
 | 
			
		||||
add_library(inih::INIReader ALIAS inih)
 | 
			
		||||
							
								
								
									
										1
									
								
								externals/inih/inih
									
									
									
									
										vendored
									
									
								
							
							
								
								
								
								
								
							
						
						
									
										1
									
								
								externals/inih/inih
									
									
									
									
										vendored
									
									
								
							 Submodule externals/inih/inih deleted from 9cecf0643d
									
								
							@@ -22,8 +22,8 @@ add_library(yuzu-android SHARED
 | 
			
		||||
 | 
			
		||||
set_property(TARGET yuzu-android PROPERTY IMPORTED_LOCATION ${FFmpeg_LIBRARY_DIR})
 | 
			
		||||
 | 
			
		||||
target_link_libraries(yuzu-android PRIVATE android camera2ndk EGL glad inih jnigraphics log)
 | 
			
		||||
target_link_libraries(yuzu-android PRIVATE audio_core common core input_common frontend_common)
 | 
			
		||||
target_link_libraries(yuzu-android PRIVATE android camera2ndk EGL glad jnigraphics log)
 | 
			
		||||
if (ARCHITECTURE_arm64)
 | 
			
		||||
    target_link_libraries(yuzu-android PRIVATE adrenotools)
 | 
			
		||||
endif()
 | 
			
		||||
 
 | 
			
		||||
@@ -30,8 +30,8 @@ add_executable(yuzu-cmd
 | 
			
		||||
 | 
			
		||||
create_target_directory_groups(yuzu-cmd)
 | 
			
		||||
 | 
			
		||||
target_link_libraries(yuzu-cmd PRIVATE inih::INIReader glad)
 | 
			
		||||
target_link_libraries(yuzu-cmd PRIVATE common core input_common frontend_common)
 | 
			
		||||
target_link_libraries(yuzu-cmd PRIVATE glad)
 | 
			
		||||
if (MSVC)
 | 
			
		||||
    target_link_libraries(yuzu-cmd PRIVATE getopt)
 | 
			
		||||
endif()
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user