cmake: Use non-conflicting variable names
This commit is contained in:
		
							
								
								
									
										52
									
								
								externals/nx_tzdb/CMakeLists.txt
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										52
									
								
								externals/nx_tzdb/CMakeLists.txt
									
									
									
									
										vendored
									
									
								
							| @@ -28,7 +28,7 @@ endif() | |||||||
| set(NX_TZDB_VERSION "220816") | set(NX_TZDB_VERSION "220816") | ||||||
| set(NX_TZDB_ARCHIVE "${CMAKE_CURRENT_BINARY_DIR}/${NX_TZDB_VERSION}.zip") | set(NX_TZDB_ARCHIVE "${CMAKE_CURRENT_BINARY_DIR}/${NX_TZDB_VERSION}.zip") | ||||||
|  |  | ||||||
| set(NX_TZDB_DIR "${CMAKE_CURRENT_BINARY_DIR}/nx_tzdb") | set(NX_TZDB_ROMFS_DIR "${CMAKE_CURRENT_BINARY_DIR}/nx_tzdb") | ||||||
|  |  | ||||||
| if ((NOT ${CAN_BUILD_NX_TZDB} OR ${YUZU_DOWNLOAD_TIME_ZONE_DATA}) AND NOT EXISTS ${NX_TZDB_ARCHIVE}) | if ((NOT ${CAN_BUILD_NX_TZDB} OR ${YUZU_DOWNLOAD_TIME_ZONE_DATA}) AND NOT EXISTS ${NX_TZDB_ARCHIVE}) | ||||||
|     set(NX_TZDB_DOWNLOAD_URL "https://github.com/lat9nq/tzdb_to_nx/releases/download/${NX_TZDB_VERSION}/${NX_TZDB_VERSION}.zip") |     set(NX_TZDB_DOWNLOAD_URL "https://github.com/lat9nq/tzdb_to_nx/releases/download/${NX_TZDB_VERSION}/${NX_TZDB_VERSION}.zip") | ||||||
| @@ -45,10 +45,12 @@ if ((NOT ${CAN_BUILD_NX_TZDB} OR ${YUZU_DOWNLOAD_TIME_ZONE_DATA}) AND NOT EXISTS | |||||||
|         INPUT |         INPUT | ||||||
|             ${NX_TZDB_ARCHIVE} |             ${NX_TZDB_ARCHIVE} | ||||||
|         DESTINATION |         DESTINATION | ||||||
|             ${NX_TZDB_DIR}) |             ${NX_TZDB_ROMFS_DIR}) | ||||||
| elseif (${CAN_BUILD_NX_TZDB}) | elseif (${CAN_BUILD_NX_TZDB} AND NOT ${YUZU_DOWNLOAD_TIME_ZONE_DATA}) | ||||||
|     add_subdirectory(tzdb_to_nx) |     add_subdirectory(tzdb_to_nx) | ||||||
|     add_dependencies(nx_tzdb x80e) |     add_dependencies(nx_tzdb x80e) | ||||||
|  |  | ||||||
|  |     set(NX_TZDB_ROMFS_DIR "${NX_TZDB_DIR}") | ||||||
| endif() | endif() | ||||||
|  |  | ||||||
| target_include_directories(nx_tzdb | target_include_directories(nx_tzdb | ||||||
| @@ -73,25 +75,25 @@ function(CreateHeader ZONE_PATH HEADER_NAME) | |||||||
|     target_sources(nx_tzdb PRIVATE ${HEADER_PATH}) |     target_sources(nx_tzdb PRIVATE ${HEADER_PATH}) | ||||||
| endfunction() | endfunction() | ||||||
|  |  | ||||||
| CreateHeader(${NX_TZDB_DIR} base) | CreateHeader(${NX_TZDB_ROMFS_DIR} base) | ||||||
| CreateHeader(${NX_TZDB_DIR}/zoneinfo zoneinfo) | CreateHeader(${NX_TZDB_ROMFS_DIR}/zoneinfo zoneinfo) | ||||||
| CreateHeader(${NX_TZDB_DIR}/zoneinfo/Africa africa) | CreateHeader(${NX_TZDB_ROMFS_DIR}/zoneinfo/Africa africa) | ||||||
| CreateHeader(${NX_TZDB_DIR}/zoneinfo/America america) | CreateHeader(${NX_TZDB_ROMFS_DIR}/zoneinfo/America america) | ||||||
| CreateHeader(${NX_TZDB_DIR}/zoneinfo/America/Argentina america_argentina) | CreateHeader(${NX_TZDB_ROMFS_DIR}/zoneinfo/America/Argentina america_argentina) | ||||||
| CreateHeader(${NX_TZDB_DIR}/zoneinfo/America/Indiana america_indiana) | CreateHeader(${NX_TZDB_ROMFS_DIR}/zoneinfo/America/Indiana america_indiana) | ||||||
| CreateHeader(${NX_TZDB_DIR}/zoneinfo/America/Kentucky america_kentucky) | CreateHeader(${NX_TZDB_ROMFS_DIR}/zoneinfo/America/Kentucky america_kentucky) | ||||||
| CreateHeader(${NX_TZDB_DIR}/zoneinfo/America/North_Dakota america_north_dakota) | CreateHeader(${NX_TZDB_ROMFS_DIR}/zoneinfo/America/North_Dakota america_north_dakota) | ||||||
| CreateHeader(${NX_TZDB_DIR}/zoneinfo/Antarctica antarctica) | CreateHeader(${NX_TZDB_ROMFS_DIR}/zoneinfo/Antarctica antarctica) | ||||||
| CreateHeader(${NX_TZDB_DIR}/zoneinfo/Arctic arctic) | CreateHeader(${NX_TZDB_ROMFS_DIR}/zoneinfo/Arctic arctic) | ||||||
| CreateHeader(${NX_TZDB_DIR}/zoneinfo/Asia asia) | CreateHeader(${NX_TZDB_ROMFS_DIR}/zoneinfo/Asia asia) | ||||||
| CreateHeader(${NX_TZDB_DIR}/zoneinfo/Atlantic atlantic) | CreateHeader(${NX_TZDB_ROMFS_DIR}/zoneinfo/Atlantic atlantic) | ||||||
| CreateHeader(${NX_TZDB_DIR}/zoneinfo/Australia australia) | CreateHeader(${NX_TZDB_ROMFS_DIR}/zoneinfo/Australia australia) | ||||||
| CreateHeader(${NX_TZDB_DIR}/zoneinfo/Brazil brazil) | CreateHeader(${NX_TZDB_ROMFS_DIR}/zoneinfo/Brazil brazil) | ||||||
| CreateHeader(${NX_TZDB_DIR}/zoneinfo/Canada canada) | CreateHeader(${NX_TZDB_ROMFS_DIR}/zoneinfo/Canada canada) | ||||||
| CreateHeader(${NX_TZDB_DIR}/zoneinfo/Chile chile) | CreateHeader(${NX_TZDB_ROMFS_DIR}/zoneinfo/Chile chile) | ||||||
| CreateHeader(${NX_TZDB_DIR}/zoneinfo/Etc etc) | CreateHeader(${NX_TZDB_ROMFS_DIR}/zoneinfo/Etc etc) | ||||||
| CreateHeader(${NX_TZDB_DIR}/zoneinfo/Europe europe) | CreateHeader(${NX_TZDB_ROMFS_DIR}/zoneinfo/Europe europe) | ||||||
| CreateHeader(${NX_TZDB_DIR}/zoneinfo/Indian indian) | CreateHeader(${NX_TZDB_ROMFS_DIR}/zoneinfo/Indian indian) | ||||||
| CreateHeader(${NX_TZDB_DIR}/zoneinfo/Mexico mexico) | CreateHeader(${NX_TZDB_ROMFS_DIR}/zoneinfo/Mexico mexico) | ||||||
| CreateHeader(${NX_TZDB_DIR}/zoneinfo/Pacific pacific) | CreateHeader(${NX_TZDB_ROMFS_DIR}/zoneinfo/Pacific pacific) | ||||||
| CreateHeader(${NX_TZDB_DIR}/zoneinfo/US us) | CreateHeader(${NX_TZDB_ROMFS_DIR}/zoneinfo/US us) | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user