From 985e87c6f9f4816a2c0ccc06314b52d91478326b Mon Sep 17 00:00:00 2001 From: Natalia Portillo Date: Mon, 19 Apr 2021 13:40:11 +0100 Subject: [PATCH] Fix CMake matches. --- setter/src/amiga/CMakeLists.txt | 3 ++- setter/src/beos/CMakeLists.txt | 2 +- setter/src/macos/CMakeLists.txt | 2 +- setter/src/unix/CMakeLists.txt | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/setter/src/amiga/CMakeLists.txt b/setter/src/amiga/CMakeLists.txt index d013663..95e98e1 100644 --- a/setter/src/amiga/CMakeLists.txt +++ b/setter/src/amiga/CMakeLists.txt @@ -22,7 +22,8 @@ # Copyright (C) 2011-2021 Natalia Portillo # *****************************************************************************/ -if(NOT ${CMAKE_SYSTEM_NAME} MATCHES "AmigaOS" AND NOT ${CMAKE_SYSTEM_NAME} MATCHES "MorphOS" AND NOT ${CMAKE_SYSTEM_NAME} MATCHES "AROS") +if(NOT ${CMAKE_SYSTEM_NAME} MATCHES "AmigaOS|MorphOS" AND NOT AROS) + message("Ignoring Amiga") return() endif() diff --git a/setter/src/beos/CMakeLists.txt b/setter/src/beos/CMakeLists.txt index 6cd04cf..ff0d9e9 100644 --- a/setter/src/beos/CMakeLists.txt +++ b/setter/src/beos/CMakeLists.txt @@ -22,7 +22,7 @@ # Copyright (C) 2011-2021 Natalia Portillo # *****************************************************************************/ -if(NOT ${CMAKE_SYSTEM_NAME} MATCHES "BeOS" AND NOT ${CMAKE_SYSTEM_NAME} MATCHES "Haiku") +if(NOT ${CMAKE_SYSTEM_NAME} MATCHES "BeOS|Haiku") return() endif() diff --git a/setter/src/macos/CMakeLists.txt b/setter/src/macos/CMakeLists.txt index 5fa0ae2..e5f94db 100644 --- a/setter/src/macos/CMakeLists.txt +++ b/setter/src/macos/CMakeLists.txt @@ -22,7 +22,7 @@ # Copyright (C) 2011-2021 Natalia Portillo # *****************************************************************************/ -if(NOT ${CMAKE_SYSTEM_NAME} MATCHES "Retro68" AND NOT ${CMAKE_SYSTEM_NAME} MATCHES "RetroPPC") +if(NOT ${CMAKE_SYSTEM_NAME} MATCHES "Retro68|RetroPPC") return() endif() diff --git a/setter/src/unix/CMakeLists.txt b/setter/src/unix/CMakeLists.txt index 0b580bd..9205df0 100644 --- a/setter/src/unix/CMakeLists.txt +++ b/setter/src/unix/CMakeLists.txt @@ -22,7 +22,7 @@ # Copyright (C) 2011-2021 Natalia Portillo # *****************************************************************************/ -if(NOT ${CMAKE_SYSTEM_NAME} MATCHES "Linux" AND NOT ${CMAKE_SYSTEM_NAME} MATCHES "Darwin" AND NOT ${CMAKE_SYSTEM_NAME} MATCHES "^(([^k].*)?BSD|DragonFly)$" ) +if(NOT ${CMAKE_SYSTEM_NAME} MATCHES "Linux|Darwin" AND NOT ${CMAKE_SYSTEM_NAME} MATCHES "^(([^k].*)?BSD|DragonFly)$" ) return() endif()