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

[cmake-commits at cmake.org]

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

Modified Files:
	SharedForward.h.in 
Log Message:
KWSys: Improve SharedForward platform table

The SharedForward header contains a preprocessor table mapping from
platform to equivalents for ldd and LD_LIBRARY_PATH.  This commit fixes
the table preprocessor directives to guarantee at most one platform.
This generalizes the commit "Fix compilation of VTK on debian/sparc".


Index: SharedForward.h.in
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/kwsys/SharedForward.h.in,v
retrieving revision 1.16
retrieving revision 1.17
diff -C 2 -d -r1.16 -r1.17
*** SharedForward.h.in	28 Sep 2009 15:37:23 -0000	1.16
--- SharedForward.h.in	16 Dec 2009 19:25:46 -0000	1.17
***************
*** 195,223 ****
  # define KWSYS_SHARED_FORWARD_LDD_N 1
  # define KWSYS_SHARED_FORWARD_LDPATH "LD_LIBRARY_PATH"
- #endif
  
  /* FreeBSD */
! #if defined(__FreeBSD__)
  # define KWSYS_SHARED_FORWARD_LDD "ldd"
  # define KWSYS_SHARED_FORWARD_LDD_N 1
  # define KWSYS_SHARED_FORWARD_LDPATH "LD_LIBRARY_PATH"
- #endif
  
  /* OSX */
! #if defined(__APPLE__)
  # define KWSYS_SHARED_FORWARD_LDD "otool", "-L"
  # define KWSYS_SHARED_FORWARD_LDD_N 2
  # define KWSYS_SHARED_FORWARD_LDPATH "DYLD_LIBRARY_PATH"
- #endif
  
  /* AIX */
! #if defined(_AIX)
  # define KWSYS_SHARED_FORWARD_LDD "dump", "-H"
  # define KWSYS_SHARED_FORWARD_LDD_N 2
  # define KWSYS_SHARED_FORWARD_LDPATH "LIBPATH"
- #endif
  
  /* SUN */
! #if defined(__sparc) && !defined(__linux)
  # define KWSYS_SHARED_FORWARD_LDD "ldd"
  # define KWSYS_SHARED_FORWARD_LDD_N 1
--- 195,219 ----
  # define KWSYS_SHARED_FORWARD_LDD_N 1
  # define KWSYS_SHARED_FORWARD_LDPATH "LD_LIBRARY_PATH"
  
  /* FreeBSD */
! #elif defined(__FreeBSD__)
  # define KWSYS_SHARED_FORWARD_LDD "ldd"
  # define KWSYS_SHARED_FORWARD_LDD_N 1
  # define KWSYS_SHARED_FORWARD_LDPATH "LD_LIBRARY_PATH"
  
  /* OSX */
! #elif defined(__APPLE__)
  # define KWSYS_SHARED_FORWARD_LDD "otool", "-L"
  # define KWSYS_SHARED_FORWARD_LDD_N 2
  # define KWSYS_SHARED_FORWARD_LDPATH "DYLD_LIBRARY_PATH"
  
  /* AIX */
! #elif defined(_AIX)
  # define KWSYS_SHARED_FORWARD_LDD "dump", "-H"
  # define KWSYS_SHARED_FORWARD_LDD_N 2
  # define KWSYS_SHARED_FORWARD_LDPATH "LIBPATH"
  
  /* SUN */
! #elif defined(__sun)
  # define KWSYS_SHARED_FORWARD_LDD "ldd"
  # define KWSYS_SHARED_FORWARD_LDD_N 1
***************
*** 228,235 ****
  #  define KWSYS_SHARED_FORWARD_LDPATH "LD_LIBRARY_PATH_64"
  # endif
- #endif
  
  /* HP-UX */
! #if defined(__hpux)
  # define KWSYS_SHARED_FORWARD_LDD "chatr"
  # define KWSYS_SHARED_FORWARD_LDD_N 1
--- 224,230 ----
  #  define KWSYS_SHARED_FORWARD_LDPATH "LD_LIBRARY_PATH_64"
  # endif
  
  /* HP-UX */
! #elif defined(__hpux)
  # define KWSYS_SHARED_FORWARD_LDD "chatr"
  # define KWSYS_SHARED_FORWARD_LDD_N 1
***************
*** 239,246 ****
  #  define KWSYS_SHARED_FORWARD_LDPATH "SHLIB_PATH"
  # endif
- #endif
  
  /* SGI MIPS */
! #if defined(__sgi) && defined(_MIPS_SIM)
  # define KWSYS_SHARED_FORWARD_LDD "ldd"
  # define KWSYS_SHARED_FORWARD_LDD_N 1
--- 234,240 ----
  #  define KWSYS_SHARED_FORWARD_LDPATH "SHLIB_PATH"
  # endif
  
  /* SGI MIPS */
! #elif defined(__sgi) && defined(_MIPS_SIM)
  # define KWSYS_SHARED_FORWARD_LDD "ldd"
  # define KWSYS_SHARED_FORWARD_LDD_N 1
***************
*** 252,259 ****
  #  define KWSYS_SHARED_FORWARD_LDPATH "LD_LIBRARY64_PATH"
  # endif
- #endif
  
  /* Windows */
! #if defined(_WIN32)
  # if defined(__CYGWIN__)
  #  define KWSYS_SHARED_FORWARD_LDD "cygcheck"
--- 246,252 ----
  #  define KWSYS_SHARED_FORWARD_LDPATH "LD_LIBRARY64_PATH"
  # endif
  
  /* Windows */
! #elif defined(_WIN32)
  # if defined(__CYGWIN__)
  #  define KWSYS_SHARED_FORWARD_LDD "cygcheck"
***************
*** 261,268 ****
  # endif
  # define KWSYS_SHARED_FORWARD_LDPATH "PATH"
- #endif
  
  /* Guess on this unknown system.  */
! #if !defined(KWSYS_SHARED_FORWARD_LDPATH)
  # define KWSYS_SHARED_FORWARD_LDD "ldd"
  # define KWSYS_SHARED_FORWARD_LDD_N 1
--- 254,260 ----
  # endif
  # define KWSYS_SHARED_FORWARD_LDPATH "PATH"
  
  /* Guess on this unknown system.  */
! #else
  # define KWSYS_SHARED_FORWARD_LDD "ldd"
  # define KWSYS_SHARED_FORWARD_LDD_N 1