From 9de44ef28a99f45069205d39026896bfcaac2ba5 Mon Sep 17 00:00:00 2001
From: Brad King <brad.king@kitware.com>
Date: Sun, 20 Jan 2008 16:02:38 -0500
Subject: BUG: FindX11 module should search for SM library instead of returning
-lSM.
---
Modules/FindX11.cmake | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/Modules/FindX11.cmake b/Modules/FindX11.cmake
index 07e164a..e5fff88 100644
--- a/Modules/FindX11.cmake
+++ b/Modules/FindX11.cmake
@@ -102,6 +102,7 @@ IF (UNIX)
# 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 @@ IF (UNIX)
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)
--
cgit v0.12