summaryrefslogtreecommitdiffstats
path: root/Tests
diff options
context:
space:
mode:
authorBill Hoffman <bill.hoffman@kitware.com>2002-11-12 19:18:36 (GMT)
committerBill Hoffman <bill.hoffman@kitware.com>2002-11-12 19:18:36 (GMT)
commit8b689f9a622722d5389d56602387fafe3d398464 (patch)
tree42f502daf95d35c91b6a24addd97d2da852c40fc /Tests
parent359ca21903fd4bef035e891ff9b366a2a0c5419f (diff)
downloadCMake-8b689f9a622722d5389d56602387fafe3d398464.zip
CMake-8b689f9a622722d5389d56602387fafe3d398464.tar.gz
CMake-8b689f9a622722d5389d56602387fafe3d398464.tar.bz2
clean up test for html output
Diffstat (limited to 'Tests')
-rw-r--r--Tests/SystemInformation/CMakeLists.txt10
-rw-r--r--Tests/SystemInformation/DumpInformation.cxx21
-rw-r--r--Tests/SystemInformation/DumpInformation.h.in2
-rw-r--r--Tests/SystemInformation/SystemInformation.in1
4 files changed, 26 insertions, 8 deletions
diff --git a/Tests/SystemInformation/CMakeLists.txt b/Tests/SystemInformation/CMakeLists.txt
index 72157ca..54feeff 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 bb5a649..a6d5b2a 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("&lt;");
+ }
+ else if(ch == '>')
+ {
+ printf("&gt;");
+ }
+ else if(ch == '&')
+ {
+ printf("&amp;");
+ }
+ 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 ce1d59a..8aacd46 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 be4a278..c3953ef 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}"