[Cmake-commits] [cmake-commits] king committed SharedForward.h.in 1.17 1.18

[cmake-commits at cmake.org]

Update of /cvsroot/CMake/CMake/Source/kwsys
In directory public:/mounts/ram/cvs-serv27738/Source/kwsys

Modified Files:
	SharedForward.h.in 
Log Message:
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.


Index: SharedForward.h.in
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/kwsys/SharedForward.h.in,v
retrieving revision 1.17
retrieving revision 1.18
diff -C 2 -d -r1.17 -r1.18
*** SharedForward.h.in	16 Dec 2009 19:25:46 -0000	1.17
--- SharedForward.h.in	13 Jan 2010 17:58:34 -0000	1.18
***************
*** 247,256 ****
  # endif
  
  /* 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"
  
--- 247,258 ----
  # 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)
  # define KWSYS_SHARED_FORWARD_LDPATH "PATH"