Skip to content

Commit 87ff9df

Browse files
authored
Revert "CMake patches for QNX Support (#178)" (#179)
This reverts commit 5d9f739. The QNX-specific changes have been moved to the relevant repos instead, as they don't belong in the general cmake rules.
1 parent 5d9f739 commit 87ff9df

File tree

3 files changed

+1
-8
lines changed

3 files changed

+1
-8
lines changed

.cmake-format.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ lint:
5454
max_branches: 40 # Default target: 12
5555
max_arguments: 6 # Default target: 5
5656
max_localvars: 15
57-
max_statements: 130 # Default target: 50
57+
max_statements: 125 # Default target: 50
5858
encode:
5959
emit_byteorder_mark: false
6060
input_encoding: utf-8

CompileOptions.cmake

-4
Original file line numberDiff line numberDiff line change
@@ -135,10 +135,6 @@ function(swift_set_compile_options)
135135
endif()
136136
endif()
137137

138-
if(CMAKE_SYSTEM_NAME MATCHES "QNX")
139-
list(APPEND all_flags -D_QNX_SOURCE)
140-
endif ()
141-
142138
list(APPEND all_flags
143139
-Wall
144140
-Wcast-align

TestTargets.cmake

-3
Original file line numberDiff line numberDiff line change
@@ -299,9 +299,6 @@ function(swift_add_test target)
299299
endif()
300300
if(x_LINK)
301301
target_link_libraries(${target} PRIVATE ${x_LINK})
302-
if(CMAKE_SYSTEM_NAME MATCHES "QNX")
303-
target_link_libraries(${target} PRIVATE regex)
304-
endif ()
305302
endif()
306303

307304
if (NOT ${PROJECT_NAME}_BUILD_TESTS)

0 commit comments

Comments
 (0)