From ba32af995f63f23d3c8281d0eb0fb09eb20e6313 Mon Sep 17 00:00:00 2001
From: Brad King <brad.king@kitware.com>
Date: Wed, 13 Jan 2010 12:58:34 -0500
Subject: [PATCH] KWSys: Fix SharedForward on Cygwin without -mwin32
When building on Cygwin without -mwin32, the _WIN32 macro may not be
defined. SharedForward must still set the PATH environment variable to
ensure runtime dependencies are found.
The 'ldd' wrapping feature uses 'cygcheck' for now since a real ldd tool
is not available in Cygwin 1.5. We can change to use the real ldd when
we choose to stop supporting legacy Cygwin and require 1.7.
---
SharedForward.h.in | 10 ++++++----
kwsysDateStamp.cmake | 2 +-
2 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/SharedForward.h.in b/SharedForward.h.in
index a5f3a4d..da62d84 100644
--- a/SharedForward.h.in
+++ b/SharedForward.h.in
@@ -246,12 +246,14 @@ static const char kwsys_shared_forward_path_slash[2] = {KWSYS_SHARED_FORWARD_PAT
# define KWSYS_SHARED_FORWARD_LDPATH "LD_LIBRARY64_PATH"
# endif
+/* Cygwin */
+#elif defined(__CYGWIN__)
+# define KWSYS_SHARED_FORWARD_LDD "cygcheck" /* TODO: cygwin 1.7 has ldd */
+# define KWSYS_SHARED_FORWARD_LDD_N 1
+# define KWSYS_SHARED_FORWARD_LDPATH "PATH"
+
/* Windows */
#elif defined(_WIN32)
-# if defined(__CYGWIN__)
-# define KWSYS_SHARED_FORWARD_LDD "cygcheck"
-# define KWSYS_SHARED_FORWARD_LDD_N 1
-# endif
# define KWSYS_SHARED_FORWARD_LDPATH "PATH"
/* Guess on this unknown system. */
diff --git a/kwsysDateStamp.cmake b/kwsysDateStamp.cmake
index 22351cb..1439667 100644
--- a/kwsysDateStamp.cmake
+++ b/kwsysDateStamp.cmake
@@ -18,4 +18,4 @@ SET(KWSYS_DATE_STAMP_YEAR 2010)
SET(KWSYS_DATE_STAMP_MONTH 01)
# KWSys version date day component. Format is DD.
-SET(KWSYS_DATE_STAMP_DAY 12)
+SET(KWSYS_DATE_STAMP_DAY 13)
--
GitLab