Commit8021f46

authored

CMake code review (#168)

1 parent49fbfc2 commit8021f46Copy full SHA for 8021f46

File tree

-2

lines changed

-2

lines changed

Lines changed: 1 addition & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -53,6 +53,7 @@ if(WINDOWS_STORE OR (DEFINED XBOX_CONSOLE_TARGET))`
`53`	`53`	`endif()`
`54`	`54`
`55`	`55`	`include(GNUInstallDirs)`
	`56`	`+include(build/CompilerAndLinker.cmake)`
`56`	`57`
`57`	`58`	`#--- Library`
`58`	`59`	`set(LIBRARY_HEADERS`
`@@ -264,8 +265,6 @@ if(MSVC)`
`264`	`265`	`endforeach()`
`265`	`266`	`endif()`
`266`	`267`
`267`		`-include(build/CompilerAndLinker.cmake)`
`268`		`-`
`269`	`268`	`foreach(t IN LISTS TOOL_EXES ITEMS${PROJECT_NAME})`
`270`	`269`	`target_compile_definitions(${t}PRIVATE${COMPILER_DEFINES})`
`271`	`270`	`target_compile_options(${t}PRIVATE${COMPILER_SWITCHES})`

Lines changed: 7 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -32,6 +32,13 @@ elseif(CMAKE_VS_PLATFORM_NAME_DEFAULT MATCHES "^[Aa][Rr][Mm]64EC$")`
`32`	`32`	`set(DIRECTX_ARCH arm64ec)`
`33`	`33`	`endif()`
`34`	`34`
	`35`	`+#--- Determines host architecture`
	`36`	`+if(CMAKE_HOST_SYSTEM_PROCESSORMATCHES"[Aa][Rr][Mm]64\|aarch64\|arm64")`
	`37`	`+ set(DIRECTX_HOST_ARCH arm64)`
	`38`	`+else()`
	`39`	`+ set(DIRECTX_HOST_ARCH x64)`
	`40`	`+endif()`
	`41`	`+`
`35`	`42`	`#--- Build with Unicode Win32 APIs per "UTF-8 Everywhere"`
`36`	`43`	`if(WIN32)`
`37`	`44`	`list(APPEND COMPILER_DEFINES _UNICODE UNICODE)`

Comments

(0)