blob: 31154f6953971b0043529b30c6c948e4814bf668 [file] [log] [blame]
--- fltk-1.3.2/src/CMakeLists.txt 2014-09-02 22:05:40.000000000 -0400
+++ fltk-1.3.2/src/CMakeLists.txt 2014-09-02 22:12:35.000000000 -0400
@@ -223,10 +223,6 @@
target_link_libraries(fltk ${CMAKE_THREAD_LIBS_INIT} ${LIB_dl})
endif(USE_THREADS)
-if(USE_X11)
- target_link_libraries(fltk ${X11_LIBRARIES})
-endif(USE_X11)
-
if(WIN32)
target_link_libraries(fltk comctl32)
endif(WIN32)
@@ -239,10 +235,6 @@
target_link_libraries(fltk ${X11_Xinerama_LIB})
endif(HAVE_XINERAMA)
-if(HAVE_XFIXES)
- target_link_libraries(fltk ${X11_Xfixes_LIB})
-endif(HAVE_XFIXES)
-
if(HAVE_XCURSOR)
target_link_libraries(fltk ${X11_Xcursor_LIB})
endif(HAVE_XCURSOR)
@@ -251,10 +243,30 @@
target_link_libraries(fltk ${X11_Xft_LIB})
endif(USE_XFT)
+if(HAVE_XFIXES)
+ target_link_libraries(fltk ${X11_Xfixes_LIB})
+endif(HAVE_XFIXES)
+
+if(X11_Xrender_FOUND)
+ target_link_libraries(fltk ${X11_Xrender_LIB})
+endif(X11_Xrender_FOUND)
+
+if(USE_X11)
+ target_link_libraries(fltk ${X11_LIBRARIES} -lxcb -lXdmcp -lXau)
+endif(USE_X11)
+
if(LIB_fontconfig)
target_link_libraries(fltk ${LIB_fontconfig})
endif(LIB_fontconfig)
+if(LIB_EXPAT)
+ target_link_libraries(fltk ${LIB_EXPAT})
+endif(LIB_EXPAT)
+
+if(LIB_freetype)
+ target_link_libraries(fltk ${LIB_freetype} ${LIB_dl})
+endif(LIB_freetype)
+
#######################################################################
add_library(fltk_forms STATIC ${FLCPPFILES})
target_link_libraries(fltk_forms fltk)
--- fltk-1.3.2/CMakeLists.txt 2014-09-02 22:56:47.000000000 -0400
+++ fltk-1.3.2/CMakeLists.txt 2014-09-02 22:57:19.000000000 -0400
@@ -147,6 +147,7 @@
find_library(LIB_jpeg jpeg)
find_library(LIB_png png)
find_library(LIB_zlib z)
+find_library(LIB_EXPAT expat)
mark_as_advanced(LIB_CAIRO LIB_dl LIB_fontconfig LIB_freetype)
mark_as_advanced(LIB_GL LIB_MesaGL)
@@ -383,7 +383,7 @@
if(OPENGL_FOUND)
set(CMAKE_REQUIRED_INCLUDES ${OPENGL_INCLUDE_DIR}/GL)
- set(CMAKE_REQUIRED_LIBRARIES -lGLU -lGL)
+ set(CMAKE_REQUIRED_LIBRARIES -lGLU -lGL -lXdmcp -lXau)
CHECK_FUNCTION_EXISTS(glXGetProcAddressARB HAVE_GLXGETPROCADDRESSARB)
set(FLTK_GL_FOUND TRUE)
else()