[Bf-blender-cvs] [77b4eb6] soc-2014-viewport_context: moved bf_intern_glew_mx to setup_linklibs

Jason Wilkins noreply at git.blender.org
Thu Jul 31 13:11:28 CEST 2014


Commit: 77b4eb667b50f05d9238445f0c5e9d6bc3dc5ba1
Author: Jason Wilkins
Date:   Thu Jul 31 06:09:58 2014 -0500
Branches: soc-2014-viewport_context
https://developer.blender.org/rB77b4eb667b50f05d9238445f0c5e9d6bc3dc5ba1

moved bf_intern_glew_mx to setup_linklibs

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

M	CMakeLists.txt
M	build_files/cmake/macros.cmake

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

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9ca52ec..0900b88 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2223,8 +2223,6 @@ if(WITH_GLEW_MX)
 	list(APPEND GL_DEFINITIONS -DWITH_GLEW_MX)
 endif()
 
-list(APPEND BLENDER_GLEW_LIBRARIES bf_intern_glew_mx)
-
 if(WITH_SYSTEM_GLEW)
 	find_package(GLEW)
 
diff --git a/build_files/cmake/macros.cmake b/build_files/cmake/macros.cmake
index 6fb62ff..22e4a7c 100644
--- a/build_files/cmake/macros.cmake
+++ b/build_files/cmake/macros.cmake
@@ -553,6 +553,8 @@ macro(SETUP_BLENDER_SORTED_LIBS)
 		extern_wcwidth
 		extern_libmv
 		extern_glog
+
+		bf_intern_glew_mx
 	)
 
 	if(WITH_COMPOSITOR)




More information about the Bf-blender-cvs mailing list