Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add support for QNX #906

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Add support for QNX #906

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7c8eb80
Add QNX modifications
chachoi Sep 3, 2024
eb89936
Add support for QNX 7.1 and 8.0
sarunnaik Nov 20, 2024
ea34a46
Remove unnecessary exclusion
sarunnaik Nov 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 10 additions & 3 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,9 @@ if (ENABLE_CUSTOM_COMPILER_FLAGS)
-Wused-but-marked-unused
-Wswitch-enum
)
if(QNX)
list(REMOVE_ITEM custom_compiler_flags -std=c89)
endif()
elseif("${CMAKE_C_COMPILER_ID}" STREQUAL "MSVC")
# Disable warning c4001 - nonstandard extension 'single line comment' was used
# Define _CRT_SECURE_NO_WARNINGS to disable deprecation warnings for "insecure" C library functions
Expand Down Expand Up @@ -153,7 +156,7 @@ install(TARGETS "${CJSON_LIB}"
)
if (BUILD_SHARED_AND_STATIC_LIBS)
install(TARGETS "${CJSON_LIB}-static"
EXPORT "${CJSON_LIB}"
EXPORT "${CJSON_LIB}"
ARCHIVE DESTINATION "${CMAKE_INSTALL_FULL_LIBDIR}"
INCLUDES DESTINATION "${CMAKE_INSTALL_FULL_INCLUDEDIR}"
)
Expand Down Expand Up @@ -201,8 +204,8 @@ if(ENABLE_CJSON_UTILS)
INCLUDES DESTINATION "${CMAKE_INSTALL_FULL_INCLUDEDIR}"
)
if (BUILD_SHARED_AND_STATIC_LIBS)
install(TARGETS "${CJSON_UTILS_LIB}-static"
EXPORT "${CJSON_UTILS_LIB}"
install(TARGETS "${CJSON_UTILS_LIB}-static"
EXPORT "${CJSON_UTILS_LIB}"
ARCHIVE DESTINATION "${CMAKE_INSTALL_FULL_LIBDIR}"
INCLUDES DESTINATION "${CMAKE_INSTALL_FULL_INCLUDEDIR}"
)
Expand Down Expand Up @@ -256,6 +259,10 @@ if(ENABLE_CJSON_TEST)
endif()
endif()

if(QNX)
install(TARGETS "${TEST_CJSON}" DESTINATION bin/cJSON_tests)
endif()

#"check" target that automatically builds everything and runs the tests
add_custom_target(check
COMMAND ${CMAKE_CTEST_COMMAND} --output-on-failure
Expand Down
10 changes: 10 additions & 0 deletions tests/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,16 @@ if(ENABLE_CJSON_TEST)

add_dependencies(check ${unity_tests})

if(QNX)
install(DIRECTORY ${PROJECT_BINARY_DIR}/tests/
DESTINATION bin/cJSON_tests
PATTERN "CMakeFiles" EXCLUDE
PATTERN "*.cmake" EXCLUDE
PATTERN "Makefile" EXCLUDE
PATTERN "*.a" EXCLUDE
)
endif()

if (ENABLE_CJSON_UTILS)
#copy test files
file(MAKE_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/json-patch-tests")
Expand Down