diff --git a/CMakeLists.txt b/CMakeLists.txt index 36a6cb57..a578d150 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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 @@ -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}" ) @@ -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}" ) @@ -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 diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index c7592213..5f65c3a8 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -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")