DO NOT REPLY TO THIS MESSAGE. INSTEAD, POST ANY RESPONSES TO THE LINK BELOW.
[STR New]
Link: http://www.fltk.org/str.php?L2317
Version: 1.3-current
Link: http://www.fltk.org/str.php?L2317
Version: 1.3-current
diff -Naur fltk-1.3.x-r7339.patched//CMakeLists.txt
fltk-1.3.x-r7339/CMakeLists.txt
--- fltk-1.3.x-r7339.patched//CMakeLists.txt 2010-03-27 11:37:00.000000000
-0400
+++ fltk-1.3.x-r7339/CMakeLists.txt 2010-03-31 13:11:39.000000000 -0400
@@ -424,6 +424,7 @@
if(OPTION_USE_THREADS AND CMAKE_HAVE_THREADS_LIBRARY)
add_definitions("-D_THREAD_SAFE -D_REENTRANT")
+ set(USE_THREADS 1)
endif(OPTION_USE_THREADS AND CMAKE_HAVE_THREADS_LIBRARY)
if(OPTION_USE_THREADS AND CMAKE_USE_PTHREADS_INIT)
diff -Naur fltk-1.3.x-r7339.patched//fluid/CMakeLists.txt
fltk-1.3.x-r7339/fluid/CMakeLists.txt
--- fltk-1.3.x-r7339.patched//fluid/CMakeLists.txt 2010-03-27
11:37:00.000000000 -0400
+++ fltk-1.3.x-r7339/fluid/CMakeLists.txt 2010-03-31 12:13:13.000000000
-0400
@@ -32,11 +32,16 @@
if(FLTK_USE_GL)
target_link_libraries(fluid fltk_gl)
+ target_link_libraries(fluid ${OPENGL_LIBRARIES})
endif(FLTK_USE_GL)
-target_link_libraries(fluid ${OPENGL_LIBRARIES})
-target_link_libraries(fluid ${X11_Xft_LIB})
-target_link_libraries(fluid ${X11_Xinerama_LIB})
+if(USE_XFT)
+ target_link_libraries(fluid ${X11_Xft_LIB})
+endif(USE_XFT)
+
+if(HAVE_XINERAMA)
+ target_link_libraries(fluid ${X11_Xinerama_LIB})
+endif(HAVE_XINERAMA)
install(TARGETS fluid
EXPORT fltk-install
diff -Naur fltk-1.3.x-r7339.patched//src/CMakeLists.txt
fltk-1.3.x-r7339/src/CMakeLists.txt
--- fltk-1.3.x-r7339.patched//src/CMakeLists.txt 2010-03-31
13:29:32.000000000 -0400
+++ fltk-1.3.x-r7339/src/CMakeLists.txt 2010-03-31 12:53:41.000000000 -0400
@@ -212,8 +212,13 @@
)
endif(MSVC)
-target_link_libraries(fltk ${CMAKE_THREAD_LIBS_INIT})
-target_link_libraries(fltk ${X11_LIBRARIES})
+if(USE_THREADS)
+ target_link_libraries(fltk ${CMAKE_THREAD_LIBS_INIT})
+endif(USE_THREADS)
+
+if(USE_X11)
+ target_link_libraries(fltk ${X11_LIBRARIES})
+endif(USE_X11)
if(WIN32)
target_link_libraries(fltk comctl32)
@@ -223,13 +228,13 @@
target_link_libraries(fltk fltk_cairo ${PKG_CAIRO_LIBRARIES})
ENDif(HAVE_CAIRO)
-if(OPTION_USE_XINERAMA)
+if(USE_XINERAMA)
target_link_libraries(fltk ${X11_Xinerama_LIB})
-endif(OPTION_USE_XINERAMA)
+endif(USE_XINERAMA)
-if(OPTION_USE_XFT)
+if(USE_XFT)
target_link_libraries(fltk ${X11_Xft_LIB})
-endif(OPTION_USE_XFT)
+endif(USE_XFT)
if(LIB_fontconfig)
target_link_libraries(fltk ${LIB_fontconfig})
@@ -321,8 +326,13 @@
set_target_properties(fltk_SHARED PROPERTIES OUTPUT_NAME fltk)
endif(MSVC)
-target_link_libraries(fltk_SHARED ${CMAKE_THREAD_LIBS_INIT})
-target_link_libraries(fltk_SHARED ${X11_LIBRARIES})
+if(USE_THREADS)
+ target_link_libraries(fltk_SHARED ${CMAKE_THREAD_LIBS_INIT})
+endif(USE_THREADS)
+
+if(USE_X11)
+ target_link_libraries(fltk_SHARED ${X11_LIBRARIES})
+endif(USE_X11)
if(WIN32)
target_link_libraries(fltk_SHARED comctl32)
@@ -332,13 +342,13 @@
target_link_libraries(fltk_SHARED fltk_cairo ${PKG_CAIRO_LIBRARIES})
ENDif(HAVE_CAIRO)
-if(OPTION_USE_XINERAMA)
+if(USE_XINERAMA)
target_link_libraries(fltk_SHARED ${X11_Xinerama_LIB})
-endif(OPTION_USE_XINERAMA)
+endif(USE_XINERAMA)
-if(OPTION_USE_XFT)
+if(USE_XFT)
target_link_libraries(fltk_SHARED ${X11_Xft_LIB})
-endif(OPTION_USE_XFT)
+endif(USE_XFT)
if(LIB_fontconfig)
target_link_libraries(fltk_SHARED ${LIB_fontconfig})
@@ -366,13 +376,19 @@
set_target_properties(fltk_forms_SHARED PROPERTIES OUTPUT_NAME fltk_forms)
endif(MSVC)
-target_link_libraries(fltk_SHARED ${CMAKE_THREAD_LIBS_INIT})
-target_link_libraries(fltk_SHARED ${X11_LIBRARIES})
+if(USE_THREADS)
+ target_link_libraries(fltk_SHARED ${CMAKE_THREAD_LIBS_INIT})
+endif(USE_THREADS)
+
+if(USE_X11)
+ target_link_libraries(fltk_SHARED ${X11_LIBRARIES})
+endif(USE_X11)
#######################################################################
add_library(fltk_images_SHARED SHARED ${IMGCPPFILES})
-target_link_libraries(fltk_images_SHARED fltk ${FLTK_PNG_LIBRARIES}
- ${FLTK_JPEG_LIBRARIES} ${FLTK_ZLIB_LIBRARIES})
+target_link_libraries(fltk_images_SHARED fltk
+ ${FLTK_PNG_LIBRARIES} ${FLTK_JPEG_LIBRARIES} ${FLTK_ZLIB_LIBRARIES}
+)
set_target_properties(fltk_images_SHARED
PROPERTIES CLEAN_DIRECT_OUTPUT 1
VERSION ${FLTK_VERSION_MAJOR}.${FLTK_VERSION_MINOR}
diff -Naur fltk-1.3.x-r7339.patched//test/CMakeLists.txt
fltk-1.3.x-r7339/test/CMakeLists.txt
--- fltk-1.3.x-r7339.patched//test/CMakeLists.txt 2010-03-27
11:37:00.000000000 -0400
+++ fltk-1.3.x-r7339/test/CMakeLists.txt 2010-03-31 12:48:20.000000000
-0400
@@ -26,8 +26,13 @@
target_link_libraries(${NAME} fltk_cairo)
endif(HAVE_CAIRO)
- target_link_libraries(${NAME} ${X11_Xft_LIB})
- target_link_libraries(${NAME} ${X11_Xinerama_LIB})
+ if(USE_XFT)
+ target_link_libraries(${NAME} ${X11_Xft_LIB})
+ endif(USE_XFT)
+
+ if(HAVE_XINERAMA)
+ target_link_libraries(${NAME} ${X11_Xinerama_LIB})
+ endif(HAVE_XINERAMA)
install(TARGETS ${NAME}
DESTINATION ${PREFIX_DOC}/examples
_______________________________________________
fltk-bugs mailing list
[email protected]
http://lists.easysw.com/mailman/listinfo/fltk-bugs
