[Bf-blender-cvs] [c2e01bb] soc-2014-viewport_context: Merge branch 'master' into soc-2014-viewport_context

Campbell Barton noreply at git.blender.org
Fri Jul 25 06:40:18 CEST 2014


Commit: c2e01bb8dd2ffdb4a89c4c402f49b1e7ea48ffca
Author: Campbell Barton
Date:   Fri Jul 25 14:39:56 2014 +1000
Branches: soc-2014-viewport_context
https://developer.blender.org/rBc2e01bb8dd2ffdb4a89c4c402f49b1e7ea48ffca

Merge branch 'master' into soc-2014-viewport_context

Conflicts:
	CMakeLists.txt

===================================================================



===================================================================

diff --cc CMakeLists.txt
index 5de6a73,b6fdccf..1890807
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@@ -635,35 -580,6 +635,35 @@@ set(PLATFORM_LINKFLAGS_DEBUG ""
  #-----------------------------------------------------------------------------
  #Platform specifics
  
 +if(WITH_X11)
 +	find_package(X11 REQUIRED)
 +
 +	find_path(X11_XF86keysym_INCLUDE_PATH X11/XF86keysym.h ${X11_INC_SEARCH_PATH})
 +	mark_as_advanced(X11_XF86keysym_INCLUDE_PATH)
 +
 +	list(APPEND PLATFORM_LINKLIBS ${X11_X11_LIB})
 +
 +	if(WITH_X11_XINPUT)
 +		if(X11_Xinput_LIB)
 +			list(APPEND PLATFORM_LINKLIBS ${X11_Xinput_LIB})
 +		else()
 +			set(WITH_X11_XINPUT OFF)
 +		endif()
 +	endif()
 +
 +	if(WITH_X11_XF86VMODE)
 +		# XXX, why dont cmake make this available?
- 		FIND_LIBRARY(X11_Xxf86vmode_LIB Xxf86vm   ${X11_LIB_SEARCH_PATH})
++		find_library(X11_Xxf86vmode_LIB Xxf86vm   ${X11_LIB_SEARCH_PATH})
 +		mark_as_advanced(X11_Xxf86vmode_LIB)
 +		if(X11_Xxf86vmode_LIB)
 +			list(APPEND PLATFORM_LINKLIBS ${X11_Xxf86vmode_LIB})
 +		else()
 +			set(WITH_X11_XF86VMODE OFF)
 +		endif()
 +	endif()
 +
 +endif()
 +
  if(UNIX AND NOT APPLE)
  	macro(find_package_wrapper)
  		string(TOUPPER ${ARGV0} _NAME_UPPER)




More information about the Bf-blender-cvs mailing list