blob: 31154f6953971b0043529b30c6c948e4814bf668 [file] [log] [blame]
Brian P. Hinz7a925912014-11-04 19:45:32 -05001--- fltk-1.3.2/src/CMakeLists.txt 2014-09-02 22:05:40.000000000 -0400
2+++ fltk-1.3.2/src/CMakeLists.txt 2014-09-02 22:12:35.000000000 -0400
3@@ -223,10 +223,6 @@
4 target_link_libraries(fltk ${CMAKE_THREAD_LIBS_INIT} ${LIB_dl})
5 endif(USE_THREADS)
6
7-if(USE_X11)
8- target_link_libraries(fltk ${X11_LIBRARIES})
9-endif(USE_X11)
10-
11 if(WIN32)
12 target_link_libraries(fltk comctl32)
13 endif(WIN32)
14@@ -239,10 +235,6 @@
15 target_link_libraries(fltk ${X11_Xinerama_LIB})
16 endif(HAVE_XINERAMA)
17
18-if(HAVE_XFIXES)
19- target_link_libraries(fltk ${X11_Xfixes_LIB})
20-endif(HAVE_XFIXES)
21-
22 if(HAVE_XCURSOR)
23 target_link_libraries(fltk ${X11_Xcursor_LIB})
24 endif(HAVE_XCURSOR)
25@@ -251,10 +243,30 @@
26 target_link_libraries(fltk ${X11_Xft_LIB})
27 endif(USE_XFT)
28
29+if(HAVE_XFIXES)
30+ target_link_libraries(fltk ${X11_Xfixes_LIB})
31+endif(HAVE_XFIXES)
32+
33+if(X11_Xrender_FOUND)
34+ target_link_libraries(fltk ${X11_Xrender_LIB})
35+endif(X11_Xrender_FOUND)
36+
37+if(USE_X11)
Brian P. Hinz2cad2292014-12-25 23:51:36 -050038+ target_link_libraries(fltk ${X11_LIBRARIES} -lxcb -lXdmcp -lXau)
Brian P. Hinz7a925912014-11-04 19:45:32 -050039+endif(USE_X11)
40+
41 if(LIB_fontconfig)
42 target_link_libraries(fltk ${LIB_fontconfig})
43 endif(LIB_fontconfig)
44
45+if(LIB_EXPAT)
46+ target_link_libraries(fltk ${LIB_EXPAT})
47+endif(LIB_EXPAT)
48+
49+if(LIB_freetype)
50+ target_link_libraries(fltk ${LIB_freetype} ${LIB_dl})
51+endif(LIB_freetype)
52+
53 #######################################################################
54 add_library(fltk_forms STATIC ${FLCPPFILES})
55 target_link_libraries(fltk_forms fltk)
56--- fltk-1.3.2/CMakeLists.txt 2014-09-02 22:56:47.000000000 -0400
57+++ fltk-1.3.2/CMakeLists.txt 2014-09-02 22:57:19.000000000 -0400
58@@ -147,6 +147,7 @@
59 find_library(LIB_jpeg jpeg)
60 find_library(LIB_png png)
61 find_library(LIB_zlib z)
62+find_library(LIB_EXPAT expat)
63
64 mark_as_advanced(LIB_CAIRO LIB_dl LIB_fontconfig LIB_freetype)
65 mark_as_advanced(LIB_GL LIB_MesaGL)
66@@ -383,7 +383,7 @@
67
68 if(OPENGL_FOUND)
69 set(CMAKE_REQUIRED_INCLUDES ${OPENGL_INCLUDE_DIR}/GL)
70- set(CMAKE_REQUIRED_LIBRARIES -lGLU -lGL)
71+ set(CMAKE_REQUIRED_LIBRARIES -lGLU -lGL -lXdmcp -lXau)
72 CHECK_FUNCTION_EXISTS(glXGetProcAddressARB HAVE_GLXGETPROCADDRESSARB)
73 set(FLTK_GL_FOUND TRUE)
74 else()