From 8b689f9a622722d5389d56602387fafe3d398464 Mon Sep 17 00:00:00 2001 From: Bill Hoffman Date: Tue, 12 Nov 2002 14:18:36 -0500 Subject: [PATCH] clean up test for html output --- Tests/SystemInformation/CMakeLists.txt | 10 +++++----- Tests/SystemInformation/DumpInformation.cxx | 21 ++++++++++++++++++-- Tests/SystemInformation/DumpInformation.h.in | 2 +- Tests/SystemInformation/SystemInformation.in | 1 + 4 files changed, 26 insertions(+), 8 deletions(-) diff --git a/Tests/SystemInformation/CMakeLists.txt b/Tests/SystemInformation/CMakeLists.txt index 72157caf4..54feeff2e 100644 --- a/Tests/SystemInformation/CMakeLists.txt +++ b/Tests/SystemInformation/CMakeLists.txt @@ -1,8 +1,8 @@ PROJECT(DumpInformation) -INCLUDE_DIRECTORIES(${SystemInformation_BINARY_DIR}) -CONFIGURE_FILE(${SystemInformation_SOURCE_DIR}/SystemInformation.in -${SystemInformation_BINARY_DIR}/SystemInformation.out) -CONFIGURE_FILE(${SystemInformation_SOURCE_DIR}/DumpInformation.h.in -${SystemInformation_BINARY_DIR}/DumpInformation.h) +INCLUDE_DIRECTORIES(${DumpInformation_BINARY_DIR}) +CONFIGURE_FILE(${DumpInformation_SOURCE_DIR}/SystemInformation.in +${DumpInformation_BINARY_DIR}/SystemInformation.out) +CONFIGURE_FILE(${DumpInformation_SOURCE_DIR}/DumpInformation.h.in +${DumpInformation_BINARY_DIR}/DumpInformation.h) ADD_EXECUTABLE(DumpInformation DumpInformation.cxx) diff --git a/Tests/SystemInformation/DumpInformation.cxx b/Tests/SystemInformation/DumpInformation.cxx index bb5a64963..a6d5b2af8 100644 --- a/Tests/SystemInformation/DumpInformation.cxx +++ b/Tests/SystemInformation/DumpInformation.cxx @@ -6,17 +6,34 @@ int main(int, char*[]) FILE* file = fopen(CMAKE_DUMP_FILE, "r"); if(!file) { - printf("Error, could not open file %s", CMAKE_DUMP_FILE); + printf("Error, could not open file %s\n", CMAKE_DUMP_FILE); return -1; } + printf("#Note less than will show up as { and greater than will be }\n"); while(!feof(file)) { int ch = fgetc(file); if(ch != EOF) { - putc(ch, stdout); + if(ch == '<') + { + printf("<"); + } + else if(ch == '>') + { + printf(">"); + } + else if(ch == '&') + { + printf("&"); + } + else + { + putc(ch, stdout); + } } } + printf("\n"); fclose(file); return 0; } diff --git a/Tests/SystemInformation/DumpInformation.h.in b/Tests/SystemInformation/DumpInformation.h.in index ce1d59aff..8aacd462f 100644 --- a/Tests/SystemInformation/DumpInformation.h.in +++ b/Tests/SystemInformation/DumpInformation.h.in @@ -1 +1 @@ -#define CMAKE_DUMP_FILE "${SystemInformation_BINARY_DIR}/SystemInformation.out" +#define CMAKE_DUMP_FILE "${DumpInformation_BINARY_DIR}/SystemInformation.out" diff --git a/Tests/SystemInformation/SystemInformation.in b/Tests/SystemInformation/SystemInformation.in index be4a27885..c3953ef0c 100644 --- a/Tests/SystemInformation/SystemInformation.in +++ b/Tests/SystemInformation/SystemInformation.in @@ -11,6 +11,7 @@ CMAKE_LINK_LIBRARY_FLAG == "${CMAKE_LINK_LIBRARY_FLAG}" CMAKE_SKIP_RPATH == "${CMAKE_SKIP_RPATH}" CMAKE_SYSTEM_INFO_FILE == "${CMAKE_SYSTEM_INFO_FILE}" CMAKE_SYSTEM_NAME == "${CMAKE_SYSTEM_NAME}" +CMAKE_SYSTEM == "${CMAKE_SYSTEM}" CMAKE_CXX_COMPILER == "${CMAKE_CXX_COMPILER}" CMAKE_C_COMPILER == "${CMAKE_C_COMPILER}"