mirror of
https://abf.rosa.ru/djam/fltk.git
synced 2025-02-23 17:02:52 +00:00
73 lines
2.3 KiB
Diff
73 lines
2.3 KiB
Diff
--- fltk-1.3.3/CMake/options.cmake~ 2014-09-27 08:41:06.000000000 +0800
|
|
+++ fltk-1.3.3/CMake/options.cmake 2015-08-14 16:13:01.246131531 +0800
|
|
@@ -45,7 +45,7 @@
|
|
endif(APPLE)
|
|
|
|
if((NOT APPLE OR OPTION_APPLE_X11) AND NOT WIN32)
|
|
- include(FindX11)
|
|
+ find_package(X11)
|
|
if(X11_FOUND)
|
|
set(USE_X11 1)
|
|
list(APPEND FLTK_CFLAGS -DUSE_X11)
|
|
--- fltk-1.3.3/src/CMakeLists.txt.0000 2014-10-31 00:05:22.000000000 +0800
|
|
+++ fltk-1.3.3/src/CMakeLists.txt 2015-08-20 15:33:25.997586144 +0800
|
|
@@ -218,7 +218,7 @@
|
|
endif(USE_THREADS)
|
|
|
|
if(USE_X11)
|
|
- target_link_libraries(fltk ${X11_LIBRARIES})
|
|
+ target_link_libraries(fltk ${X11_Xext_LIB} ${X11_X11_LIB} ${LIB_dl})
|
|
endif(USE_X11)
|
|
|
|
if(WIN32)
|
|
@@ -278,7 +278,7 @@
|
|
#######################################################################
|
|
if(OPENGL_FOUND)
|
|
FL_ADD_LIBRARY(fltk_gl STATIC "${GLCPPFILES}")
|
|
- target_link_libraries(fltk_gl fltk ${OPENGL_LIBRARIES})
|
|
+ target_link_libraries(fltk_gl fltk ${OPENGL_gl_LIBRARY})
|
|
endif(OPENGL_FOUND)
|
|
|
|
#######################################################################
|
|
@@ -293,7 +293,7 @@
|
|
endif(USE_THREADS)
|
|
|
|
if(USE_X11)
|
|
- target_link_libraries(fltk_SHARED ${X11_LIBRARIES})
|
|
+ target_link_libraries(fltk_SHARED ${X11_Xext_LIB} ${X11_X11_LIB} ${LIB_dl})
|
|
endif(USE_X11)
|
|
|
|
if(WIN32)
|
|
@@ -308,6 +308,14 @@
|
|
target_link_libraries(fltk_SHARED ${X11_Xinerama_LIB})
|
|
endif(HAVE_XINERAMA)
|
|
|
|
+if(HAVE_XFIXES)
|
|
+ target_link_libraries(fltk_SHARED ${X11_Xfixes_LIB})
|
|
+endif(HAVE_XFIXES)
|
|
+
|
|
+if(HAVE_XCURSOR)
|
|
+ target_link_libraries(fltk_SHARED ${X11_Xcursor_LIB})
|
|
+endif(HAVE_XCURSOR)
|
|
+
|
|
if(USE_XFT)
|
|
target_link_libraries(fltk_SHARED ${X11_Xft_LIB})
|
|
if(LIB_fontconfig)
|
|
@@ -324,7 +332,7 @@
|
|
endif(USE_THREADS)
|
|
|
|
if(USE_X11)
|
|
- target_link_libraries(fltk_forms_SHARED ${X11_LIBRARIES})
|
|
+ target_link_libraries(fltk_forms_SHARED ${X11_X11_LIB})
|
|
endif(USE_X11)
|
|
|
|
#######################################################################
|
|
@@ -352,7 +360,7 @@
|
|
#######################################################################
|
|
if(OPENGL_FOUND)
|
|
FL_ADD_LIBRARY(fltk_gl SHARED "${GLCPPFILES}")
|
|
- target_link_libraries(fltk_gl_SHARED fltk_SHARED ${OPENGL_LIBRARIES})
|
|
+ target_link_libraries(fltk_gl_SHARED fltk_SHARED ${OPENGL_gl_LIBRARY})
|
|
endif(OPENGL_FOUND)
|
|
|
|
#######################################################################
|