[cmake-commits] king committed FindX11.cmake 1.30 1.31

[cmake-commits at cmake.org]

Update of /cvsroot/CMake/CMake/Modules
In directory public:/mounts/ram/cvs-serv14194/Modules

Modified Files:
	FindX11.cmake 
Log Message:
BUG: FindX11 module should search for SM library instead of returning -lSM.


Index: FindX11.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindX11.cmake,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- FindX11.cmake	4 Jan 2008 16:56:18 -0000	1.30
+++ FindX11.cmake	20 Jan 2008 21:02:38 -0000	1.31
@@ -102,6 +102,7 @@
 
   # Find additional X libraries. Keep list sorted by library name.
   FIND_LIBRARY(X11_ICE_LIB ICE               ${X11_LIB_SEARCH_PATH})
+  FIND_LIBRARY(X11_SM_LIB SM                 ${X11_LIB_SEARCH_PATH})
   FIND_LIBRARY(X11_Xau_LIB Xau               ${X11_LIB_SEARCH_PATH})
   FIND_LIBRARY(X11_Xcomposite_LIB Xcomposite ${X11_LIB_SEARCH_PATH})
   FIND_LIBRARY(X11_Xcursor_LIB Xcursor       ${X11_LIB_SEARCH_PATH})
@@ -343,7 +344,10 @@
       CHECK_LIBRARY_EXISTS("ICE" "IceConnectionNumber" "${X11_LIBRARY_DIR}"
                             CMAKE_LIB_ICE_HAS_ICECONNECTIONNUMBER)
       IF(CMAKE_LIB_ICE_HAS_ICECONNECTIONNUMBER)
-        SET (X11_X_PRE_LIBS -lSM ${X11_ICE_LIB})
+        SET (X11_X_PRE_LIBS ${X11_ICE_LIB})
+        IF(X11_SM_LIB)
+          SET (X11_X_PRE_LIBS ${X11_SM_LIB} ${X11_X_PRE_LIBS})
+        ENDIF(X11_SM_LIB)
       ENDIF(CMAKE_LIB_ICE_HAS_ICECONNECTIONNUMBER)
     ENDIF (X11_ICE_FOUND)