Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
Bugzilla DB migration completed. Please report issues to Infra team via email via infra@gentoo.org or IRC
View | Details | Raw Unified | Return to bug 276338 | Differences between
and this patch

Collapse All | Expand All

(-)CMakeLists.txt.orig (-21 / +41 lines)
Lines 44-49 Link Here
44
44
45
CMAKE_MINIMUM_REQUIRED(VERSION 2.4)
45
CMAKE_MINIMUM_REQUIRED(VERSION 2.4)
46
PROJECT(Blender)
46
PROJECT(Blender)
47
IF(COMMAND CMAKE_POLICY)
48
	CMAKE_POLICY(SET CMP0000 NEW)
49
	CMAKE_POLICY(SET CMP0001 NEW)
50
	CMAKE_POLICY(SET CMP0002 NEW)
51
	CMAKE_POLICY(SET CMP0003 NEW)
52
	CMAKE_POLICY(SET CMP0004 NEW)
53
	CMAKE_POLICY(SET CMP0005 NEW)
54
	CMAKE_POLICY(SET CMP0006 NEW)
55
	CMAKE_POLICY(SET CMP0007 NEW)
56
	CMAKE_POLICY(SET CMP0008 NEW)
57
	CMAKE_POLICY(SET CMP0009 NEW)
58
	CMAKE_POLICY(SET CMP0010 NEW)
59
	CMAKE_POLICY(SET CMP0011 NEW)
60
ENDIF(COMMAND CMAKE_POLICY)
47
61
48
#-----------------------------------------------------------------------------
62
#-----------------------------------------------------------------------------
49
# Redirect output files
63
# Redirect output files
Lines 90-107 Link Here
90
#-----------------------------------------------------------------------------
104
#-----------------------------------------------------------------------------
91
# Load some macros.
105
# Load some macros.
92
INCLUDE(CMake/macros.cmake)
106
INCLUDE(CMake/macros.cmake)
107
SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_SOURCE_DIR}/CMake)
93
108
94
#-----------------------------------------------------------------------------
109
#-----------------------------------------------------------------------------
95
#Platform specifics
110
#Platform specifics
96
111
97
IF(UNIX AND NOT APPLE)
112
IF(UNIX AND NOT APPLE)
113
114
	#IF(WITH_BULLET)
115
	#	FIND_PACKAGE(Bullet REQUIRED)
116
	#ENDIF(WITH_BULLET)
117
98
	IF(WITH_OPENAL)
118
	IF(WITH_OPENAL)
99
		FIND_PACKAGE(OpenAL)
119
		FIND_PACKAGE(OpenAL REQUIRED)
100
		IF(OPENAL_FOUND)
120
		#IF(OPENAL_FOUND)
101
			SET(WITH_OPENAL ON)
121
		#	SET(WITH_OPENAL ON)
102
		ELSE(OPENAL_FOUND)
122
		#ELSE(OPENAL_FOUND)
103
			SET(WITH_OPENAL OFF)
123
		#	SET(WITH_OPENAL OFF)
104
		ENDIF(OPENAL_FOUND)
124
		#ENDIF(OPENAL_FOUND)
105
	ENDIF(WITH_OPENAL)
125
	ENDIF(WITH_OPENAL)
106
126
107
	IF(WITH_JACK)
127
	IF(WITH_JACK)
Lines 133-139 Link Here
133
		SET(GETTEXT_LIB ${INTL_LIBRARY} ${ICONV_LIBRARY})
153
		SET(GETTEXT_LIB ${INTL_LIBRARY} ${ICONV_LIBRARY})
134
	ENDIF(INTL_LIBRARY AND ICONV_LIBRARY)
154
	ENDIF(INTL_LIBRARY AND ICONV_LIBRARY)
135
155
136
	FIND_PACKAGE(Freetype)
156
	FIND_PACKAGE(Freetype REQUIRED)
137
	# UNSET(FREETYPE_INCLUDE_DIRS CACHE) # cant use
157
	# UNSET(FREETYPE_INCLUDE_DIRS CACHE) # cant use
138
158
139
	# No way to set py31. remove for now.
159
	# No way to set py31. remove for now.
Lines 151-161 Link Here
151
	SET(PYTHON_LINKFLAGS "-Xlinker -export-dynamic")
171
	SET(PYTHON_LINKFLAGS "-Xlinker -export-dynamic")
152
172
153
	IF(WITH_SDL)
173
	IF(WITH_SDL)
154
		FIND_PACKAGE(SDL)
174
		FIND_PACKAGE(SDL REQUIRED)
155
		# UNSET(SDLMAIN_LIBRARY CACHE)
175
		# UNSET(SDLMAIN_LIBRARY CACHE)
156
		IF(NOT SDL_FOUND)
176
		#IF(NOT SDL_FOUND)
157
			SET(WITH_SDL OFF)
177
		#	SET(WITH_SDL OFF)
158
		ENDIF(NOT SDL_FOUND)
178
		#ENDIF(NOT SDL_FOUND)
159
	ENDIF(WITH_SDL)
179
	ENDIF(WITH_SDL)
160
180
161
	FIND_PATH(OPENEXR_INC
181
	FIND_PATH(OPENEXR_INC
Lines 393-404 Link Here
393
	ENDIF(CMAKE_OSX_ARCHITECTURES MATCHES i386)
413
	ENDIF(CMAKE_OSX_ARCHITECTURES MATCHES i386)
394
414
395
	IF(WITH_OPENAL)
415
	IF(WITH_OPENAL)
396
		FIND_PACKAGE(OpenAL)
416
		FIND_PACKAGE(OpenAL REQUIRED)
397
		IF(OPENAL_FOUND)
417
		#IF(OPENAL_FOUND)
398
			SET(WITH_OPENAL ON)
418
		#	SET(WITH_OPENAL ON)
399
		ELSE(OPENAL_FOUND)
419
		#ELSE(OPENAL_FOUND)
400
			SET(WITH_OPENAL OFF)
420
		#	SET(WITH_OPENAL OFF)
401
		ENDIF(OPENAL_FOUND)
421
		#ENDIF(OPENAL_FOUND)
402
	ENDIF(WITH_OPENAL)
422
	ENDIF(WITH_OPENAL)
403
423
404
	IF(WITH_JACK)
424
	IF(WITH_JACK)
Lines 526-534 Link Here
526
#-----------------------------------------------------------------------------
546
#-----------------------------------------------------------------------------
527
# Common.
547
# Common.
528
548
529
set(OPENJPEG ${CMAKE_SOURCE_DIR}/extern/libopenjpeg)
549
IF(WITH_OPENJPEG)
530
set(OPENJPEG_INC ${OPENJPEG})
550
	FIND_PACKAGE(OpenJPEG REQUIRED)
531
set(OPENJPEG_LIb extern_libopenjpeg)
551
ENDIF(WITH_OPENJPEG)
532
552
533
#-----------------------------------------------------------------------------
553
#-----------------------------------------------------------------------------
534
# Blender WebPlugin
554
# Blender WebPlugin
Lines 543-549 Link Here
543
563
544
#-----------------------------------------------------------------------------
564
#-----------------------------------------------------------------------------
545
# Configure OpenGL.
565
# Configure OpenGL.
546
FIND_PACKAGE(OpenGL)
566
FIND_PACKAGE(OpenGL REQUIRED)
547
INCLUDE_DIRECTORIES(${OPENGL_INCLUDE_DIR})
567
INCLUDE_DIRECTORIES(${OPENGL_INCLUDE_DIR})
548
# UNSET(OPENGL_LIBRARIES CACHE) # not compat with older cmake 
568
# UNSET(OPENGL_LIBRARIES CACHE) # not compat with older cmake 
549
# UNSET(OPENGL_xmesa_INCLUDE_DIR CACHE) # not compat with older cmake 
569
# UNSET(OPENGL_xmesa_INCLUDE_DIR CACHE) # not compat with older cmake 

Return to bug 276338