Fix warnings related to CMP0054

The LINUX variable is only available in 3.25+
This commit is contained in:
Sandy Carter
2023-01-06 15:52:00 -05:00
committed by Sandy
parent c85f396456
commit ef8234966e
2 changed files with 11 additions and 10 deletions

View File

@@ -8,8 +8,9 @@
# You should have received a copy of the CC0 Public Domain Dedication along with # You should have received a copy of the CC0 Public Domain Dedication along with
# this software. If not, see <http://creativecommons.org/publicdomain/zero/1.0/>. # this software. If not, see <http://creativecommons.org/publicdomain/zero/1.0/>.
cmake_minimum_required(VERSION 3.0) cmake_minimum_required(VERSION 3.1)
project(bgfx) project(bgfx)
cmake_policy(SET CMP0054 NEW)
set_property(GLOBAL PROPERTY USE_FOLDERS ON) set_property(GLOBAL PROPERTY USE_FOLDERS ON)
set(CMAKE_CXX_STANDARD 14) set(CMAKE_CXX_STANDARD 14)

View File

@@ -67,22 +67,22 @@ function(shaderc_parse ARG_OUT)
set(PLATFORM "${P}") set(PLATFORM "${P}")
endif() endif()
endforeach() endforeach()
if("${PLATFORM}" STREQUAL "") if(PLATFORM STREQUAL "")
message(SEND_ERROR "Call to shaderc_parse() must have a platform flag: ${PLATFORMS}") message(SEND_ERROR "Call to shaderc_parse() must have a platform flag: ${PLATFORMS}")
return() return()
elseif("${PLATFORM}" STREQUAL "ANDROID") elseif(PLATFORM STREQUAL ANDROID)
list(APPEND CLI "--platform" "android") list(APPEND CLI "--platform" "android")
elseif("${PLATFORM}" STREQUAL "ASM_JS") elseif(PLATFORM STREQUAL ASM_JS)
list(APPEND CLI "--platform" "asm.js") list(APPEND CLI "--platform" "asm.js")
elseif("${PLATFORM}" STREQUAL "IOS") elseif(PLATFORM STREQUAL IOS)
list(APPEND CLI "--platform" "ios") list(APPEND CLI "--platform" "ios")
elseif("${PLATFORM}" STREQUAL "LINUX") elseif(PLATFORM STREQUAL NACL)
list(APPEND CLI "--platform" "linux")
elseif("${PLATFORM}" STREQUAL "NACL")
list(APPEND CLI "--platform" "nacl") list(APPEND CLI "--platform" "nacl")
elseif("${PLATFORM}" STREQUAL "OSX") elseif(PLATFORM STREQUAL OSX)
list(APPEND CLI "--platform" "osx") list(APPEND CLI "--platform" "osx")
elseif("${PLATFORM}" STREQUAL "WINDOWS") elseif(PLATFORM STREQUAL UNIX)
list(APPEND CLI "--platform" "linux")
elseif(PLATFORM STREQUAL WINDOWS)
list(APPEND CLI "--platform" "windows") list(APPEND CLI "--platform" "windows")
endif() endif()