Compilation fixes for QNX platform

Modifies some CMakeLists.txt to add QNX specific checks
using the 'DE_OS_QNX' or 'DE_OS_IS_QNX' compilation flags.

Doesn't change functionality for any other platform.

VK-GL-CTS issue: 537

Components: Framework

Change-Id: I34d4091f2b0f064f22abc4996abb4bed94e4a83f

diff --git a/external/libpng/CMakeLists.txt b/external/libpng/CMakeLists.txt
index 0cbed64bc65f8a1a6c5ac31340079063a2c43495..7181ba44e5d6bb4afb6b547a1092a490ab46c993 100644 (file)
--- a/external/libpng/CMakeLists.txt
+++ b/external/libpng/CMakeLists.txt
@@ -53,7 +53,7 @@ if (DE_DEBUG EQUAL 1)
        add_definitions(-DPNG_DEBUG)
 endif ()
 
-if (DE_OS_IS_UNIX)
+if (DE_OS_IS_UNIX OR DE_OS_IS_QNX)
        # for snprintf()
        add_definitions(-D_XOPEN_SOURCE=600)
 endif ()

diff --git a/external/zlib/CMakeLists.txt b/external/zlib/CMakeLists.txt
index f59e023799ff7ff40bdb3dd1f13ea7348b0ac36c..40ca18d9768636e550a5295c9ec559ada452e3c4 100644 (file)
--- a/external/zlib/CMakeLists.txt
+++ b/external/zlib/CMakeLists.txt
@@ -60,7 +60,7 @@ elseif (DE_COMPILER_IS_GCC OR DE_COMPILER_IS_CLANG)
 
 endif ()
 
-if (DE_OS_IS_UNIX)
+if (DE_OS_IS_UNIX OR DE_OS_IS_QNX)
        add_definitions(-D_XOPEN_SOURCE=600)
 endif ()
 

diff --git a/framework/delibs/debase/CMakeLists.txt b/framework/delibs/debase/CMakeLists.txt
index 636d73ecf1bd23f88e0400b47d3b68fdba914b4a..800507e2950e64a158b292c803b68190f4b29244 100644 (file)
--- a/framework/delibs/debase/CMakeLists.txt
+++ b/framework/delibs/debase/CMakeLists.txt
@@ -29,7 +29,7 @@ set(DEBASE_SRCS
 add_library(debase STATIC ${DEBASE_SRCS})
 
 # link debase to libm on unix systems
-if (DE_OS_IS_UNIX)
+if (DE_OS_IS_UNIX OR DE_OS_IS_QNX)
        target_link_libraries(debase m)
 
        add_definitions(-D_XOPEN_SOURCE=600)

diff --git a/framework/delibs/depool/CMakeLists.txt b/framework/delibs/depool/CMakeLists.txt
index 3a10ec205be28432ddf4bbc46bc9ef39ca768a15..1270d45399cd2ff3293a6f0d08b4faedc9dc2f77 100644 (file)
--- a/framework/delibs/depool/CMakeLists.txt
+++ b/framework/delibs/depool/CMakeLists.txt
@@ -27,7 +27,7 @@ set(DEPOOL_SRCS
        dePoolTest.h
        )
 
-if (DE_OS_IS_UNIX)
+if (DE_OS_IS_UNIX OR DE_OS_IS_QNX)
        # vsnprintf
        add_definitions(-D_XOPEN_SOURCE=600)
 endif ()

diff --git a/framework/delibs/dethread/unix/deThreadUnix.c b/framework/delibs/dethread/unix/deThreadUnix.c
index 2e1016897d57ac34285e28f0c2f99f9bf2ae8732..28372913b9f6eb4c924344e88f6e261166ba0ccb 100644 (file)
--- a/framework/delibs/dethread/unix/deThreadUnix.c
+++ b/framework/delibs/dethread/unix/deThreadUnix.c
@@ -35,7 +35,9 @@
 #include <unistd.h>
 #include <pthread.h>
 #include <sched.h>
-#include <sys/syscall.h>
+#if (DE_OS == DE_OS_UNIX) || (DE_OS == DE_OS_ANDROID)
+#      include <sys/syscall.h>
+#endif
 
 #if (DE_OS == DE_OS_OSX) || (DE_OS == DE_OS_IOS)
 #      if !defined(_SC_NPROCESSORS_CONF)

diff --git a/framework/delibs/deutil/CMakeLists.txt b/framework/delibs/deutil/CMakeLists.txt
index c98a1da78e9136801decddd0ca92b236ad660043..cee54092f814fb7acbdb8b3c1e36c90f03af8ca3 100644 (file)
--- a/framework/delibs/deutil/CMakeLists.txt
+++ b/framework/delibs/deutil/CMakeLists.txt
@@ -41,7 +41,7 @@ if (DE_OS_IS_WIN32)
        set(DEUTIL_LIBS WS2_32)
 endif ()
 
-if (DE_OS_IS_UNIX)
+if (DE_OS_IS_UNIX OR DE_OS_IS_QNX)
        add_definitions(-D_XOPEN_SOURCE=600)
 endif ()
 

diff --git a/framework/qphelper/CMakeLists.txt b/framework/qphelper/CMakeLists.txt
index 46b6a9fbe34a868a9cec576723de398f46768d03..e803cb91ed4e00134bb7abe8a6628d491fb130c9 100644 (file)
--- a/framework/qphelper/CMakeLists.txt
+++ b/framework/qphelper/CMakeLists.txt
@@ -25,7 +25,7 @@ set(QPHELPER_LIBS
        ${PNG_LIBRARY}
        )
 
-if (DE_OS_IS_UNIX)
+if (DE_OS_IS_UNIX OR DE_OS_IS_QNX)
        # For vsnprintf()
        add_definitions(-D_XOPEN_SOURCE=600)
 endif ()