From ef8234966ee6626666b6303e150d4522974b2fc0 Mon Sep 17 00:00:00 2001 From: Sandy Carter Date: Fri, 6 Jan 2023 15:52:00 -0500 Subject: [PATCH] Fix warnings related to CMP0054 The LINUX variable is only available in 3.25+ --- CMakeLists.txt | 3 ++- cmake/bgfxToolUtils.cmake | 18 +++++++++--------- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index ec427db..363f0f1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -8,8 +8,9 @@ # You should have received a copy of the CC0 Public Domain Dedication along with # this software. If not, see . -cmake_minimum_required(VERSION 3.0) +cmake_minimum_required(VERSION 3.1) project(bgfx) +cmake_policy(SET CMP0054 NEW) set_property(GLOBAL PROPERTY USE_FOLDERS ON) set(CMAKE_CXX_STANDARD 14) diff --git a/cmake/bgfxToolUtils.cmake b/cmake/bgfxToolUtils.cmake index 60c1a64..0eea083 100644 --- a/cmake/bgfxToolUtils.cmake +++ b/cmake/bgfxToolUtils.cmake @@ -67,22 +67,22 @@ function(shaderc_parse ARG_OUT) set(PLATFORM "${P}") endif() endforeach() - if("${PLATFORM}" STREQUAL "") + if(PLATFORM STREQUAL "") message(SEND_ERROR "Call to shaderc_parse() must have a platform flag: ${PLATFORMS}") return() - elseif("${PLATFORM}" STREQUAL "ANDROID") + elseif(PLATFORM STREQUAL ANDROID) list(APPEND CLI "--platform" "android") - elseif("${PLATFORM}" STREQUAL "ASM_JS") + elseif(PLATFORM STREQUAL ASM_JS) list(APPEND CLI "--platform" "asm.js") - elseif("${PLATFORM}" STREQUAL "IOS") + elseif(PLATFORM STREQUAL IOS) list(APPEND CLI "--platform" "ios") - elseif("${PLATFORM}" STREQUAL "LINUX") - list(APPEND CLI "--platform" "linux") - elseif("${PLATFORM}" STREQUAL "NACL") + elseif(PLATFORM STREQUAL NACL) list(APPEND CLI "--platform" "nacl") - elseif("${PLATFORM}" STREQUAL "OSX") + elseif(PLATFORM STREQUAL 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") endif()