Skip to content

Commit 2847636

Browse files
authored
Merge pull request #3744 from pablorcum/develop
Improves building from sources for QNX
2 parents 9a15791 + 1b1f781 commit 2847636

File tree

3 files changed

+7
-6
lines changed

3 files changed

+7
-6
lines changed

CONTRIBUTORS.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -211,4 +211,5 @@ In chronological order:
211211
* PLCT Lab, Institute of Software Chinese Academy of Sciences
212212
* [2022-03] Support RISC-V Vector Intrinisc 1.0 version.
213213

214-
214+
* Pablo Romero <https://github.com/pablorcum>
215+
* [2022-08] Fix building from sources for QNX

common.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ extern "C" {
9090
#endif
9191
#include <time.h>
9292

93-
#ifdef OS_LINUX
93+
#if defined(OS_LINUX) || defined(OS_QNX)
9494
#include <malloc.h>
9595
#include <sched.h>
9696
#endif
@@ -107,7 +107,7 @@ extern "C" {
107107
#endif
108108
#endif
109109

110-
#ifdef OS_HAIKU
110+
#if defined(OS_HAIKU) || defined(OS_QNX)
111111
#define NO_SYSV_IPC
112112
#endif
113113

ctest/CMakeLists.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ else()
4040
c_${float_char}blas1.c)
4141
endif()
4242
target_link_libraries(x${float_char}cblat1 ${OpenBLAS_LIBNAME})
43-
if(${CMAKE_SYSTEM_NAME} MATCHES "Linux" OR ${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD")
43+
if(${CMAKE_SYSTEM_NAME} MATCHES "Linux" OR ${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD" OR ${CMAKE_SYSTEM_NAME} MATCHES "QNX")
4444
target_link_libraries(x${float_char}cblat1 m)
4545
endif()
4646
add_test(NAME "x${float_char}cblat1"
@@ -65,7 +65,7 @@ else()
6565
constant.c)
6666
endif()
6767
target_link_libraries(x${float_char}cblat2 ${OpenBLAS_LIBNAME})
68-
if(${CMAKE_SYSTEM_NAME} MATCHES "Linux" OR ${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD")
68+
if(${CMAKE_SYSTEM_NAME} MATCHES "Linux" OR ${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD" OR ${CMAKE_SYSTEM_NAME} MATCHES "QNX")
6969
target_link_libraries(x${float_char}cblat2 m)
7070
endif()
7171
add_test(NAME "x${float_char}cblat2"
@@ -90,7 +90,7 @@ else()
9090
constant.c)
9191
endif()
9292
target_link_libraries(x${float_char}cblat3 ${OpenBLAS_LIBNAME})
93-
if(${CMAKE_SYSTEM_NAME} MATCHES "Linux" OR ${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD")
93+
if(${CMAKE_SYSTEM_NAME} MATCHES "Linux" OR ${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD" OR ${CMAKE_SYSTEM_NAME} MATCHES "QNX")
9494
target_link_libraries(x${float_char}cblat3 m)
9595
endif()
9696
add_test(NAME "x${float_char}cblat3"

0 commit comments

Comments
 (0)