[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [54239] trunk/blender/CMakeLists.txt: disable xinerama and xinput if libraries are missing.

[Campbell Barton]

Revision: 54239
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=54239
Author:   campbellbarton
Date:     2013-01-31 20:41:47 +0000 (Thu, 31 Jan 2013)
Log Message:
-----------
disable xinerama and xinput if libraries are missing.

Modified Paths:
--------------
    trunk/blender/CMakeLists.txt

Modified: trunk/blender/CMakeLists.txt
===================================================================
--- trunk/blender/CMakeLists.txt	2013-01-31 17:38:09 UTC (rev 54238)
+++ trunk/blender/CMakeLists.txt	2013-01-31 20:41:47 UTC (rev 54239)
@@ -799,11 +799,19 @@
 		set(PLATFORM_LINKLIBS "${PLATFORM_LINKLIBS} ${X11_X11_LIB}")
 
 		if(WITH_X11_XINPUT)
-			set(PLATFORM_LINKLIBS "${PLATFORM_LINKLIBS} ${X11_Xinput_LIB}")
+			if(X11_Xinput_LIB)
+				set(PLATFORM_LINKLIBS "${PLATFORM_LINKLIBS} ${X11_Xinput_LIB}")
+			else()
+				set(WITH_X11_XINPUT OFF)
+			endif()
 		endif()
 
 		if(WITH_X11_XINERAMA)
-			set(PLATFORM_LINKLIBS "${PLATFORM_LINKLIBS} ${X11_Xinerama_LIB}")
+			if(X11_Xinerama_LIB)
+				set(PLATFORM_LINKLIBS "${PLATFORM_LINKLIBS} ${X11_Xinerama_LIB}")
+			else()
+				set(WITH_X11_XINERAMA OFF)
+			endif()
 		endif()
 
 		if(WITH_X11_XF86VMODE)
@@ -2138,6 +2146,7 @@
 	info_cfg_option(WITH_INSTALL_PORTABLE)
 	info_cfg_option(WITH_X11_XF86VMODE)
 	info_cfg_option(WITH_X11_XINPUT)
+	info_cfg_option(WITH_X11_XINERAMA)
 	info_cfg_option(WITH_MEM_JEMALLOC)
 	info_cfg_option(WITH_SYSTEM_GLEW)
 	info_cfg_option(WITH_SYSTEM_OPENJPEG)