kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'upstream-kwiml' into import-KWIML

This commit is contained in:
Brad King 2011-11-15 14:30:58 -05:00
parent 93cebcaf23 a8f6159f69
commit 5be0e92218
3 changed files with 24 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Utilities/KWIML/INT.h.in
View File

@ -191,9 +191,10 @@ An includer may test the following macros after inclusion:
#endif #endif
#if defined(__INTEL_COMPILER) #if defined(__INTEL_COMPILER)
#elif defined(__SUNPRO_C) && __SUNPRO_C < 0x570 # if defined(_WIN32)
# define @KWIML@_INT__NO_SCN8 # define @KWIML@_INT__NO_SCN8
#elif defined(__SUNPRO_CC) && __SUNPRO_CC < 0x570 # endif
#elif defined(__SUNPRO_C) || defined(__SUNPRO_CC)
# define @KWIML@_INT__NO_SCN8 # define @KWIML@_INT__NO_SCN8
#elif defined(__HP_cc) || defined(__HP_aCC) #elif defined(__HP_cc) || defined(__HP_aCC)
# define @KWIML@_INT__NO_SCN8 # define @KWIML@_INT__NO_SCN8

17
Utilities/KWIML/test/CMakeLists.txt
View File

@ -18,6 +18,13 @@ set_property(DIRECTORY
"KWIML_HEADER(%)=<${KWIML}/%>" "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) if(KWIML_LANGUAGE_C)
set(test_srcs test.c) set(test_srcs test.c)
else() else()
@ -49,3 +56,13 @@ set_property(TARGET ${KWIML}_test PROPERTY
RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}) RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
add_test(${KWIML}.test ${CMAKE_CURRENT_BINARY_DIR}/${KWIML}_test) add_test(${KWIML}.test ${CMAKE_CURRENT_BINARY_DIR}/${KWIML}_test)
set_property(TEST ${KWIML}.test PROPERTY LABELS ${KWIML_LABELS_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()

4
Utilities/KWIML/test/test.h
View File

@ -28,7 +28,9 @@
#define KWIML_HEADER1(x) <x> #define KWIML_HEADER1(x) <x>
/* Quiet MS standard library deprecation warnings. */ /* Quiet MS standard library deprecation warnings. */
#define _CRT_SECURE_NO_DEPRECATE #ifndef _CRT_SECURE_NO_DEPRECATE
# define _CRT_SECURE_NO_DEPRECATE
#endif
#else #else
# error "test.h included multiple times." # error "test.h included multiple times."