Fix test so that it does some modules testing by checking for some functions and some size of types

6 files changed, 66 insertions, 6 deletions

diff --git a/Tests/LoadCommand/CMakeLists.txt b/Tests/LoadCommand/CMakeLists.txt
index 793589a..fa9e5ac 100644
--- a/Tests/LoadCommand/CMakeLists.txt
+++ b/Tests/LoadCommand/CMakeLists.txt
@@ -3,6 +3,24 @@ PROJECT(LoadedCommand)
 # set a definition
 SET (TEST_COMMAND_TEST1 1)
 
+INCLUDE (${CMAKE_ROOT}/Modules/CheckSizeOf.cmake)
+CHECK_TYPE_SIZE(char  SIZEOF_CHAR)
+CHECK_TYPE_SIZE(short SIZEOF_SHORT)
+CHECK_TYPE_SIZE(int   SIZEOF_INT)
+CHECK_TYPE_SIZE(long  SIZEOF_LONG)
+CHECK_TYPE_SIZE("long long" SIZEOF_LONG_LONG)
+CHECK_TYPE_SIZE(__int64   SIZEOF___INT64)
+
+INCLUDE (${CMAKE_ROOT}/Modules/CheckFunctionExists.cmake)
+CHECK_FUNCTION_EXISTS(vsprintf  HAVE_VSPRINTF)
+CHECK_FUNCTION_EXISTS(vsnprintf HAVE_VSNPRINTF)
+CHECK_FUNCTION_EXISTS(vsblabla  HAVE_VSBLABLA)
+
+CONFIGURE_FILE(${LoadedCommand_SOURCE_DIR}/LoadedCommand.h.in
+               ${LoadedCommand_BINARY_DIR}/LoadedCommand.h)
+
+INCLUDE_DIRECTORIES(${LoadedCommand_BINARY_DIR})
+
 # try to compile the command
 TRY_COMPILE(COMPILE_OK 
     ${LoadedCommand_BINARY_DIR}/CMakeCommands 
@@ -28,4 +46,3 @@ IF (TEST_DEF)
 ENDIF (TEST_DEF)
 
 ADD_EXECUTABLE (LoadedCommand LoadedCommand.cxx)
-
diff --git a/Tests/LoadCommand/LoadedCommand.cxx b/Tests/LoadCommand/LoadedCommand.cxx
index c2a3439..65483c8 100644
--- a/Tests/LoadCommand/LoadedCommand.cxx
+++ b/Tests/LoadCommand/LoadedCommand.cxx
@@ -1,8 +1,10 @@
+#include "LoadedCommand.h"
+
 int main ()
 {
 #ifdef CMAKE_IS_FUN
-  return 0;
+  return SIZEOF_CHAR-1;
 #else  
-  return 1;
+  return SIZEOF_SHORT;
 #endif
 }
diff --git a/Tests/LoadCommand/LoadedCommand.h.in b/Tests/LoadCommand/LoadedCommand.h.in
new file mode 100644
index 0000000..7b210f8
--- /dev/null
+++ b/Tests/LoadCommand/LoadedCommand.h.in
@@ -0,0 +1,11 @@
+#cmakedefine SIZEOF_CHAR      ${SIZEOF_CHAR}
+#cmakedefine SIZEOF_SHORT     ${SIZEOF_SHORT}
+#cmakedefine SIZEOF_INT       ${SIZEOF_INT}
+#cmakedefine SIZEOF_LONG      ${SIZEOF_LONG}
+#cmakedefine SIZEOF_LONG_LONG ${SIZEOF_LONG_LONG}
+#cmakedefine SIZEOF___INT64   ${SIZEOF___INT64}
+
+#cmakedefine HAVE_VSPRINTF
+#cmakedefine HAVE_VSNPRINTF
+#cmakedefine HAVE_VSBLABLA
+
diff --git a/Tests/LoadCommandOneConfig/CMakeLists.txt b/Tests/LoadCommandOneConfig/CMakeLists.txt
index 793589a..fa9e5ac 100644
--- a/Tests/LoadCommandOneConfig/CMakeLists.txt
+++ b/Tests/LoadCommandOneConfig/CMakeLists.txt
@@ -3,6 +3,24 @@ PROJECT(LoadedCommand)
 # set a definition
 SET (TEST_COMMAND_TEST1 1)
 
+INCLUDE (${CMAKE_ROOT}/Modules/CheckSizeOf.cmake)
+CHECK_TYPE_SIZE(char  SIZEOF_CHAR)
+CHECK_TYPE_SIZE(short SIZEOF_SHORT)
+CHECK_TYPE_SIZE(int   SIZEOF_INT)
+CHECK_TYPE_SIZE(long  SIZEOF_LONG)
+CHECK_TYPE_SIZE("long long" SIZEOF_LONG_LONG)
+CHECK_TYPE_SIZE(__int64   SIZEOF___INT64)
+
+INCLUDE (${CMAKE_ROOT}/Modules/CheckFunctionExists.cmake)
+CHECK_FUNCTION_EXISTS(vsprintf  HAVE_VSPRINTF)
+CHECK_FUNCTION_EXISTS(vsnprintf HAVE_VSNPRINTF)
+CHECK_FUNCTION_EXISTS(vsblabla  HAVE_VSBLABLA)
+
+CONFIGURE_FILE(${LoadedCommand_SOURCE_DIR}/LoadedCommand.h.in
+               ${LoadedCommand_BINARY_DIR}/LoadedCommand.h)
+
+INCLUDE_DIRECTORIES(${LoadedCommand_BINARY_DIR})
+
 # try to compile the command
 TRY_COMPILE(COMPILE_OK 
     ${LoadedCommand_BINARY_DIR}/CMakeCommands 
@@ -28,4 +46,3 @@ IF (TEST_DEF)
 ENDIF (TEST_DEF)
 
 ADD_EXECUTABLE (LoadedCommand LoadedCommand.cxx)
-
diff --git a/Tests/LoadCommandOneConfig/LoadedCommand.cxx b/Tests/LoadCommandOneConfig/LoadedCommand.cxx
index c2a3439..65483c8 100644
--- a/Tests/LoadCommandOneConfig/LoadedCommand.cxx
+++ b/Tests/LoadCommandOneConfig/LoadedCommand.cxx
@@ -1,8 +1,10 @@
+#include "LoadedCommand.h"
+
 int main ()
 {
 #ifdef CMAKE_IS_FUN
-  return 0;
+  return SIZEOF_CHAR-1;
 #else  
-  return 1;
+  return SIZEOF_SHORT;
 #endif
 }
diff --git a/Tests/LoadCommandOneConfig/LoadedCommand.h.in b/Tests/LoadCommandOneConfig/LoadedCommand.h.in
new file mode 100644
index 0000000..7b210f8
--- /dev/null
+++ b/Tests/LoadCommandOneConfig/LoadedCommand.h.in
@@ -0,0 +1,11 @@
+#cmakedefine SIZEOF_CHAR      ${SIZEOF_CHAR}
+#cmakedefine SIZEOF_SHORT     ${SIZEOF_SHORT}
+#cmakedefine SIZEOF_INT       ${SIZEOF_INT}
+#cmakedefine SIZEOF_LONG      ${SIZEOF_LONG}
+#cmakedefine SIZEOF_LONG_LONG ${SIZEOF_LONG_LONG}
+#cmakedefine SIZEOF___INT64   ${SIZEOF___INT64}
+
+#cmakedefine HAVE_VSPRINTF
+#cmakedefine HAVE_VSNPRINTF
+#cmakedefine HAVE_VSBLABLA
+