Attachment #476530 for bug #601068




	# On some systems (e.g., Fedora 21), there is a bug in the cmake code
	# that detects GLUT libraries.  The following ugliness is a workaround for 
	# this problem.
	set(GLUT_LIBRARIES "${GLUT_glut_LIBRARY}")
		if (NOT GLUT_Xmu_LIBRARY)
			set(GLUT_Xmu_LIBRARY "")
			message(WARNING "Clearing bogus value for GLUT_Xmu_LIBRARY.")
			message(WARNING "Your version of CMake may be buggy.")
		endif()
		if (NOT GLUT_Xmi_LIBRARY)
			set(GLUT_Xmi_LIBRARY "")
			message(WARNING "Clearing bogus value for GLUT_Xmi_LIBRARY.")
			message(WARNING "Your version of CMake may be buggy.")
		endif()
		set(GLUT_LIBRARIES "${GLUT_glut_LIBRARY}")
	endif()
else()
	set(JAS_HAVE_OPENGL 0)
	set(OPENGL_INCLUDE_DIR "")

Lines 24-29 if(JAS_HAVE_OPENGL) Link Here

(-)jasper-version-2.0.12-old/src/appl/CMakeLists.txt (+3 lines)
24	add_executable(jiv jiv.c)	24	add_executable(jiv jiv.c)
25	target_include_directories(jiv PUBLIC	25	target_include_directories(jiv PUBLIC
26	${GLUT_INCLUDE_DIR} ${OPENGL_INCLUDE_DIR})	26	${GLUT_INCLUDE_DIR} ${OPENGL_INCLUDE_DIR})
		27	if(JAS_HAVE_GL_GLUT_H)
		28	set_source_files_properties(jiv.c PROPERTIES COMPILE_DEFINITIONS JAS_HAVE_GL_GLUT_H)
		29	endif()
27	target_link_libraries(jiv libjasper ${JPEG_LIBRARIES} ${GLUT_LIBRARIES}	30	target_link_libraries(jiv libjasper ${JPEG_LIBRARIES} ${GLUT_LIBRARIES}
28	${OPENGL_LIBRARIES} ${MATH_LIBRARY})	31	${OPENGL_LIBRARIES} ${MATH_LIBRARY})
29	set(programs "${programs}" jiv)	32	set(programs "${programs}" jiv)

Lines 26-34 Link Here

(-)jasper-version-2.0.12-old/src/libjasper/include/jasper/jas_config.h.in (-3 lines)
26	#cmakedefine JAS_HAVE_GETTIMEOFDAY 1	26	#cmakedefine JAS_HAVE_GETTIMEOFDAY 1
27	#cmakedefine JAS_HAVE_GETRUSAGE 1	27	#cmakedefine JAS_HAVE_GETRUSAGE 1
28		28
29	#cmakedefine JAS_HAVE_GL_GLUT_H 1
30	#cmakedefine JAS_HAVE_GLUT_H 1
31
32	#define JAS_HAVE_SNPRINTF 1	29	#define JAS_HAVE_SNPRINTF 1
33		30
34	#else	31	#else

Return to bug 601068

Lines 294-312 if (JAS_ENABLE_OPENGL AND OPENGL_FOUND) Link Here

(-)jasper-version-2.0.12-old/CMakeLists.txt (-13 / +1 lines)
294	# On some systems (e.g., Fedora 21), there is a bug in the cmake code	294	# On some systems (e.g., Fedora 21), there is a bug in the cmake code
295	# that detects GLUT libraries. The following ugliness is a workaround for	295	# that detects GLUT libraries. The following ugliness is a workaround for
296	# this problem.	296	# this problem.
297	if (NOT GLUT_Xmu_LIBRARY OR NOT GLUT_Xmi_LIBRARY)	297	set(GLUT_LIBRARIES "${GLUT_glut_LIBRARY}")
298	if (NOT GLUT_Xmu_LIBRARY)
299	set(GLUT_Xmu_LIBRARY "")
300	message(WARNING "Clearing bogus value for GLUT_Xmu_LIBRARY.")
301	message(WARNING "Your version of CMake may be buggy.")
302	endif()
303	if (NOT GLUT_Xmi_LIBRARY)
304	set(GLUT_Xmi_LIBRARY "")
305	message(WARNING "Clearing bogus value for GLUT_Xmi_LIBRARY.")
306	message(WARNING "Your version of CMake may be buggy.")
307	endif()
308	set(GLUT_LIBRARIES "${GLUT_glut_LIBRARY}")
309	endif()
310	else()	298	else()
311	set(JAS_HAVE_OPENGL 0)	299	set(JAS_HAVE_OPENGL 0)
312	set(OPENGL_INCLUDE_DIR "")	300	set(OPENGL_INCLUDE_DIR "")