Merge branch 'upstream-kwiml' into import-KWIML
This commit is contained in:
commit
5be0e92218
|
@ -191,9 +191,10 @@ An includer may test the following macros after inclusion:
|
|||
#endif
|
||||
|
||||
#if defined(__INTEL_COMPILER)
|
||||
#elif defined(__SUNPRO_C) && __SUNPRO_C < 0x570
|
||||
# define @KWIML@_INT__NO_SCN8
|
||||
#elif defined(__SUNPRO_CC) && __SUNPRO_CC < 0x570
|
||||
# if defined(_WIN32)
|
||||
# define @KWIML@_INT__NO_SCN8
|
||||
# endif
|
||||
#elif defined(__SUNPRO_C) || defined(__SUNPRO_CC)
|
||||
# define @KWIML@_INT__NO_SCN8
|
||||
#elif defined(__HP_cc) || defined(__HP_aCC)
|
||||
# define @KWIML@_INT__NO_SCN8
|
||||
|
|
|
@ -18,6 +18,13 @@ set_property(DIRECTORY
|
|||
"KWIML_HEADER(%)=<${KWIML}/%>"
|
||||
)
|
||||
|
||||
# Suppress printf/scanf format warnings; we test if the sizes match.
|
||||
foreach(lang C CXX)
|
||||
if(KWIML_LANGUAGE_${lang} AND "${CMAKE_${lang}_COMPILER_ID}" STREQUAL GNU)
|
||||
set(CMAKE_${lang}_FLAGS "${CMAKE_${lang}_FLAGS} -Wno-format")
|
||||
endif()
|
||||
endforeach()
|
||||
|
||||
if(KWIML_LANGUAGE_C)
|
||||
set(test_srcs test.c)
|
||||
else()
|
||||
|
@ -49,3 +56,13 @@ set_property(TARGET ${KWIML}_test PROPERTY
|
|||
RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
|
||||
add_test(${KWIML}.test ${CMAKE_CURRENT_BINARY_DIR}/${KWIML}_test)
|
||||
set_property(TEST ${KWIML}.test PROPERTY LABELS ${KWIML_LABELS_TEST})
|
||||
|
||||
# Xcode 2.x forgets to create the output directory before linking
|
||||
# the individual architectures.
|
||||
if(CMAKE_OSX_ARCHITECTURES AND XCODE
|
||||
AND NOT "${XCODE_VERSION}" MATCHES "^[^12]")
|
||||
add_custom_command(
|
||||
TARGET ${KWIML}_test
|
||||
PRE_BUILD COMMAND ${CMAKE_COMMAND} -E make_directory "${CMAKE_CFG_INTDIR}"
|
||||
)
|
||||
endif()
|
||||
|
|
|
@ -28,7 +28,9 @@
|
|||
#define KWIML_HEADER1(x) <x>
|
||||
|
||||
/* Quiet MS standard library deprecation warnings. */
|
||||
#define _CRT_SECURE_NO_DEPRECATE
|
||||
#ifndef _CRT_SECURE_NO_DEPRECATE
|
||||
# define _CRT_SECURE_NO_DEPRECATE
|
||||
#endif
|
||||
|
||||
#else
|
||||
# error "test.h included multiple times."
|
||||
|
|
Loading…
Reference in New Issue