From 87ff9dfa312f8533879be6f28dd932f5b7b1d4a6 Mon Sep 17 00:00:00 2001 From: Adharsh Babu Date: Fri, 20 Sep 2024 08:20:06 -0700 Subject: [PATCH] Revert "CMake patches for QNX Support (#178)" (#179) This reverts commit 5d9f739ebd13834152a9305eb089c7377c5b5b3b. The QNX-specific changes have been moved to the relevant repos instead, as they don't belong in the general cmake rules. --- .cmake-format.yaml | 2 +- CompileOptions.cmake | 4 ---- TestTargets.cmake | 3 --- 3 files changed, 1 insertion(+), 8 deletions(-) diff --git a/.cmake-format.yaml b/.cmake-format.yaml index 9e365b7..8d4baa2 100644 --- a/.cmake-format.yaml +++ b/.cmake-format.yaml @@ -54,7 +54,7 @@ lint: max_branches: 40 # Default target: 12 max_arguments: 6 # Default target: 5 max_localvars: 15 - max_statements: 130 # Default target: 50 + max_statements: 125 # Default target: 50 encode: emit_byteorder_mark: false input_encoding: utf-8 diff --git a/CompileOptions.cmake b/CompileOptions.cmake index 9f059c6..3de0191 100644 --- a/CompileOptions.cmake +++ b/CompileOptions.cmake @@ -135,10 +135,6 @@ function(swift_set_compile_options) endif() endif() - if(CMAKE_SYSTEM_NAME MATCHES "QNX") - list(APPEND all_flags -D_QNX_SOURCE) - endif () - list(APPEND all_flags -Wall -Wcast-align diff --git a/TestTargets.cmake b/TestTargets.cmake index 59509ab..26558b1 100644 --- a/TestTargets.cmake +++ b/TestTargets.cmake @@ -299,9 +299,6 @@ function(swift_add_test target) endif() if(x_LINK) target_link_libraries(${target} PRIVATE ${x_LINK}) - if(CMAKE_SYSTEM_NAME MATCHES "QNX") - target_link_libraries(${target} PRIVATE regex) - endif () endif() if (NOT ${PROJECT_NAME}_BUILD_TESTS)