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

Merge branch 'update-KWIML' into crypto-hash

This commit is contained in:
Brad King 2011-11-17 10:19:36 -05:00
parent 6495b595c4 aaf376594c
commit 1ec3fa00c9
6 changed files with 53 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/kwsys/kwsysDateStamp.cmake
View File

@ -18,4 +18,4 @@ SET(KWSYS_DATE_STAMP_YEAR 2011)
SET(KWSYS_DATE_STAMP_MONTH 11)
# KWSys version date day component. Format is DD.
SET(KWSYS_DATE_STAMP_DAY 14)
SET(KWSYS_DATE_STAMP_DAY 17)

3
Utilities/KWIML/ABI.h.in
View File

@ -216,7 +216,8 @@ suppression macro @KWIML@_ABI_NO_VERIFY was defined.
# endif
#endif
#if !defined(@KWIML@_ABI_SIZEOF_LONG_LONG)
# if defined(_LONGLONG) /* SGI, some GNU, perhaps others. */
# if defined(_LONGLONG) /* SGI, some GNU, perhaps others. */ \
&& !defined(_MSC_VER)
# define @KWIML@_ABI_SIZEOF_LONG_LONG 8
# elif defined(_LONG_LONG) /* IBM XL, perhaps others. */
# define @KWIML@_ABI_SIZEOF_LONG_LONG 8

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

@ -35,6 +35,7 @@ if(KWIML_LANGUAGE_C)
list(APPEND test_srcs
test_ABI_C.c
test_INT_C.c
test_include_C.c
)
endif()
if(KWIML_LANGUAGE_CXX)
@ -42,6 +43,7 @@ if(KWIML_LANGUAGE_CXX)
list(APPEND test_srcs
test_ABI_CXX.cxx
test_INT_CXX.cxx
test_include_CXX.cxx
)
endif()

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

@ -16,6 +16,8 @@ extern int test_ABI_C(void);
extern int test_INT_C(void);
extern int test_ABI_CXX(void);
extern int test_INT_CXX(void);
extern int test_include_C(void);
extern int test_include_CXX(void);
#ifdef __cplusplus
} // extern "C"
#endif
@ -26,10 +28,12 @@ int main(void)
#ifdef KWIML_LANGUAGE_C
result = test_ABI_C() && result;
result = test_INT_C() && result;
result = test_include_C() && result;
#endif
#ifdef KWIML_LANGUAGE_CXX
result = test_ABI_CXX() && result;
result = test_INT_CXX() && result;
result = test_include_CXX() && result;
#endif
return result? 0 : 1;
}

22
Utilities/KWIML/test/test_include_C.c Normal file
View File

@ -0,0 +1,22 @@
/*============================================================================
Kitware Information Macro Library
Copyright 2010-2011 Kitware, Inc.
Distributed under the OSI-approved BSD License (the "License");
see accompanying file Copyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even the
implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
See the License for more information.
============================================================================*/
#include <stdio.h>
/* Test KWIML header inclusion after above system headers. */
#include "test.h"
#include KWIML_HEADER(ABI.h)
#include KWIML_HEADER(INT.h)
int test_include_C(void)
{
return 1;
}

22
Utilities/KWIML/test/test_include_CXX.cxx Normal file
View File

@ -0,0 +1,22 @@
/*============================================================================
Kitware Information Macro Library
Copyright 2010-2011 Kitware, Inc.
Distributed under the OSI-approved BSD License (the "License");
see accompanying file Copyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even the
implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
See the License for more information.
============================================================================*/
#include <string>
/* Test KWIML header inclusion after above system headers. */
#include "test.h"
#include KWIML_HEADER(ABI.h)
#include KWIML_HEADER(INT.h)
extern "C" int test_include_CXX(void)
{
return 1;
}