From 7ecacbfa030196d77592cb363f11cd889faa6a13 Mon Sep 17 00:00:00 2001
From: Brad King <brad.king@kitware.com>
Date: Wed, 10 Jun 2009 11:46:06 -0400
Subject: [PATCH] COMP: Avoid String.c inclusion by Compaq templates
The Compaq compiler (on VMS) includes 'String.c' in source files that
use the stl string while looking for template definitions. This was the
true cause of double-inclusion of the 'kwsysPrivate.h' header. We work
around the problem by conditionally compiling the entire source file on
a condition only true when really building the source.
---
CMakeLists.txt | 6 ++++++
String.c | 10 ++++++++++
kwsysDateStamp.cmake | 2 +-
kwsysPrivate.h | 4 +---
4 files changed, 18 insertions(+), 4 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 645a4193..145e43a4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -848,6 +848,12 @@ ENDIF(KWSYS_ENABLE_C AND KWSYS_C_SRCS)
# line to configure the namespace in the C and C++ source files.
ADD_DEFINITIONS("-DKWSYS_NAMESPACE=${KWSYS_NAMESPACE}")
+IF(KWSYS_USE_String)
+ # Activate code in "String.c". See the comment in the source.
+ SET_SOURCE_FILES_PROPERTIES(String.c PROPERTIES
+ COMPILE_FLAGS "-DKWSYS_STRING_C")
+ENDIF(KWSYS_USE_String)
+
#-----------------------------------------------------------------------------
# Process execution on windows needs to build a forwarding executable
# that works around a Win9x bug. We encode the executable into a C
diff --git a/String.c b/String.c
index 2df11781..7d328491 100644
--- a/String.c
+++ b/String.c
@@ -11,6 +11,14 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
+#ifdef KWSYS_STRING_C
+/*
+All code in this source file is conditionally compiled to work-around
+template definition auto-search on VMS. Other source files in this
+directory that use the stl string cause the compiler to load this
+source to try to get the definition of the string template. This
+condition blocks the compiler from seeing the symbols defined here.
+*/
#include "kwsysPrivate.h"
#include KWSYS_HEADER(String.h)
@@ -105,3 +113,5 @@ int kwsysString_strncasecmp(const char* lhs, const char* rhs, size_t n)
return result;
#endif
}
+
+#endif /* KWSYS_STRING_C */
diff --git a/kwsysDateStamp.cmake b/kwsysDateStamp.cmake
index 2f56a098..c4649386 100644
--- a/kwsysDateStamp.cmake
+++ b/kwsysDateStamp.cmake
@@ -7,4 +7,4 @@ SET(KWSYS_DATE_STAMP_YEAR 2009)
SET(KWSYS_DATE_STAMP_MONTH 06)
# KWSys version date day component. Format is DD.
-SET(KWSYS_DATE_STAMP_DAY 09)
+SET(KWSYS_DATE_STAMP_DAY 10)
diff --git a/kwsysPrivate.h b/kwsysPrivate.h
index e0211708..90623e50 100644
--- a/kwsysPrivate.h
+++ b/kwsysPrivate.h
@@ -39,7 +39,5 @@
#define KWSYS_NAMESPACE_STRING1(x) #x
#else
-# ifndef __VMS /* Avoid strange false positive on VMS compiler. */
-# error "kwsysPrivate.h included multiple times."
-# endif
+# error "kwsysPrivate.h included multiple times."
#endif
--
GitLab