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-r7216.patched//CMakeLists.txt
fltk-1.3.x-r7216/CMakeLists.txt
--- fltk-1.3.x-r7216.patched//CMakeLists.txt 2010-03-10 10:54:35.000000000
-0500
+++ fltk-1.3.x-r7216/CMakeLists.txt 2010-03-10 11:28:03.000000000 -0500
@@ -134,28 +134,28 @@
find_file(HAVE_DIRENT_H dirent.h)
find_file(HAVE_DLFCN_H dlfcn.h)
find_file(HAVE_FREETYPE_H freetype.h PATH_SUFFIXES freetype2)
-find_file(FLTK_GL_GL_H GL/gl.h)
-find_file(FLTK_GL_GLU_H GL/glu.h)
+find_file(HAVE_GL_GL_H GL/gl.h)
+find_file(HAVE_GL_GLU_H GL/glu.h)
find_file(HAVE_LIBPNG_PNG_H libpng/png.h)
find_file(HAVE_LOCALE_H locale.h)
find_file(HAVE_NDIR_H ndir.h)
find_file(HAVE_OPENGL_GLU_H OpenGL/glu.h)
find_file(HAVE_PNG_H png.h)
-find_file(FLTK_PTHREAD_H pthread.h)
+find_file(HAVE_PTHREAD_H pthread.h)
find_file(HAVE_STDIO_H stdio.h)
find_file(HAVE_STRINGS_H strings.h)
find_file(HAVE_SYS_DIR_H sys/dir.h)
find_file(HAVE_SYS_NDIR_H sys/ndir.h)
-find_file(FLTK_SYS_SELECT_H sys/select.h)
+find_file(HAVE_SYS_SELECT_H sys/select.h)
find_file(HAVE_SYS_STDTYPES_H sys/stdtypes.h)
find_path(HAVE_XDBE_H Xdbe.h PATH_SUFFIXES X11/extensions extensions)
mark_as_advanced(HAVE_ALSA_ASOUNDLIB_H HAVE_DIRENT_H HAVE_DLFCN_H)
-mark_as_advanced(HAVE_FREETYPE_H FLTK_GL_GL_H FLTK_GL_GLU_H)
+mark_as_advanced(HAVE_FREETYPE_H HAVE_GL_GL_H HAVE_GL_GLU_H)
mark_as_advanced(HAVE_LIBPNG_PNG_H HAVE_LOCALE_H HAVE_NDIR_H)
-mark_as_advanced(HAVE_OPENGL_GLU_H HAVE_PNG_H FLTK_PTHREAD_H)
+mark_as_advanced(HAVE_OPENGL_GLU_H HAVE_PNG_H HAVE_PTHREAD_H)
mark_as_advanced(HAVE_STDIO_H HAVE_STRINGS_H HAVE_SYS_DIR_H)
-mark_as_advanced(HAVE_SYS_NDIR_H FLTK_SYS_SELECT_H)
+mark_as_advanced(HAVE_SYS_NDIR_H HAVE_SYS_SELECT_H)
mark_as_advanced(HAVE_SYS_STDTYPES_H HAVE_XDBE_H)
# where to find freetype headers
@@ -335,13 +335,9 @@
#######################################################################
option(OPTION_USE_POLL "use poll if available" OFF)
-CHECK_FUNCTION_EXISTS(poll HAVE_POLL)
-
-if(OPTION_USE_POLL AND HAVE_POLL)
- set(USE_POLL 1)
-else()
- set(USE_POLL 0)
-endif(OPTION_USE_POLL AND HAVE_POLL)
+if(OPTION_USE_POLL)
+ CHECK_FUNCTION_EXISTS(poll USE_POLL)
+endif(OPTION_USE_POLL)
#######################################################################
option(OPTION_BUILD_SHARED_LIBS "Build shared libraries" OFF)
@@ -366,9 +362,7 @@
add_subdirectory(cairo)
list(APPEND FLTK_LDLIBS -lcairo -lpixman-1)
include_directories(${PKG_CAIRO_INCLUDE_DIRS})
- foreach(FLAG ${PKG_CAIRO_CFLAGS})
- set(CAIROFLAGS "${FLAG} ${CAIROFLAGS}")
- endforeach(FLAG ${PKG_CAIRO_CFLAGS})
+ string(REPLACE ";" " " CAIROFLAGS "${PKG_CAIRO_CFLAGS}")
endif(PKG_CAIRO_FOUND)
if(LIB_CAIRO AND OPTION_CAIROEXT AND PKG_CAIRO_FOUND)
@@ -388,18 +382,12 @@
set(HAVE_GL 1)
set(CMAKE_REQUIRED_INCLUDES ${OPENGL_INCLUDE_DIR}/GL)
set(CMAKE_REQUIRED_LIBRARIES -lGLU -lGL)
- CHECK_FUNCTION_EXISTS(glXGetProcAddressARB FLTK_GLXGETPROCADDRESSARB)
+ CHECK_FUNCTION_EXISTS(glXGetProcAddressARB HAVE_GLXGETPROCADDRESSARB)
else()
set(FLTK_USE_GL 0)
set(HAVE_GL_GLU_H 0)
endif(OPTION_USE_GL AND OPENGL_FOUND)
-if(FLTK_GLXGETPROCADDRESSARB)
- set(HAVE_GLXGETPROCADDRESSARB 1)
-else()
- set(HAVE_GLXGETPROCADDRESSARB 0)
-endif(FLTK_GLXGETPROCADDRESSARB)
-
#######################################################################
option(OPTION_USE_THREADS "use multi-threading" ON)
@@ -546,24 +534,6 @@
# final setup and config
#######################################################################
# generate config.h
-if(FLTK_SYS_SELECT_H)
- set(HAVE_SYS_SELECT_H 1)
-else()
- set(HAVE_SYS_SELECT_H 0)
-endif(FLTK_SYS_SELECT_H)
-
-if(FLTK_GL_GLU_H)
- set(HAVE_GL_GLU_H 1)
-else()
- set(HAVE_GL_GLU_H 0)
-endif(FLTK_GL_GLU_H)
-
-if(FLTK_PTHREAD_H)
- set(HAVE_PTHREAD_H 1)
-else()
- set(HAVE_PTHREAD_H 0)
-endif(FLTK_PTHREAD_H)
-
configure_file("${FLTK_SOURCE_DIR}/configh.cmake.in"
"${FLTK_BINARY_DIR}/config.h" @ONLY
)
@@ -572,17 +542,12 @@
get_filename_component(CC ${CMAKE_C_COMPILER} NAME)
get_filename_component(CXX ${CMAKE_CXX_COMPILER} NAME)
-foreach(FLAG ${FLTK_CFLAGS})
- set(C_FLAGS "${FLAG} ${C_FLAGS}")
-endforeach(FLAG ${FLTK_CFLAGS})
+string(REPLACE ";" " " C_FLAGS "${FLTK_CFLAGS}")
if(X11_Xext_FOUND)
list(APPEND FLTK_LDLIBS -lXext)
endif(X11_Xext_FOUND)
-
-foreach(LIB ${FLTK_LDLIBS})
- set(LD_LIBS "${LIB} ${LD_LIBS}")
-endforeach(LIB FLTK_LDLIBS)
+string(REPLACE ";" " " LD_LIBS "${FLTK_LDLIBS}")
configure_file(${FLTK_SOURCE_DIR}/fltk-config.cmake.in
${FLTK_BINARY_DIR}/bin/fltk-config
@@ -635,7 +600,8 @@
install(DIRECTORY ${FLTK_BINARY_DIR}/FL
DESTINATION include USE_SOURCE_PERMISSIONS
)
-install(DIRECTORY ${FLTK_BINARY_DIR}/Fl OPTIONAL
+
+install(DIRECTORY ${FLTK_BINARY_DIR}/Fl
DESTINATION ${PREFIX_INCLUDE} USE_SOURCE_PERMISSIONS
)
@@ -644,11 +610,6 @@
OPTIONAL
)
-install(DIRECTORY ${FLTK_BINARY_DIR}/bin/examples
- DESTINATION ${PREFIX_DOC}
- OPTIONAL
- )
-
if(CMAKE_HOST_UNIX)
macro(INSTALL_MAN FILE LEVEL)
install(FILES
@@ -656,7 +617,7 @@
DESTINATION ${PREFIX_MAN}/man${LEVEL}
RENAME ${FILE}.${LEVEL}
)
- endmacro(INSTALL_MAN FILE DEST)
+ endmacro(INSTALL_MAN FILE LEVEL)
INSTALL_MAN(fluid 1)
INSTALL_MAN(fltk-config 1)
diff -Naur fltk-1.3.x-r7216.patched//configh.cmake.in
fltk-1.3.x-r7216/configh.cmake.in
--- fltk-1.3.x-r7216.patched//configh.cmake.in 2010-03-10 10:54:35.000000000
-0500
+++ fltk-1.3.x-r7216/configh.cmake.in 2010-03-10 11:19:44.000000000 -0500
@@ -56,7 +56,7 @@
* OpenGL, and FLTK will be smaller.
*/
-#define HAVE_GL @HAVE_GL@
+#cmakedefine01 HAVE_GL
/*
* HAVE_GL_GLU_H:
@@ -65,7 +65,7 @@
* (many broken Mesa RPMs do not...)
*/
-#cmakedefine HAVE_GL_GLU_H @HAVE_GL_GLU_H@
+#cmakedefine01 HAVE_GL_GLU_H
/*
* HAVE_GLXGETPROCADDRESSARB:
@@ -73,7 +73,7 @@
* Do you have the OpenGL glXGetProcAddressARB() function?
*/
-#cmakedefine HAVE_GLXGETPROCADDRESSARB @HAVE_GLXGETPROCADDRESSARB@
+#cmakedefine01 HAVE_GLXGETPROCADDRESSARB
/*
* USE_COLORMAP:
@@ -223,7 +223,7 @@
* Whether or not select() call has its own header file.
*/
-#define HAVE_SYS_SELECT_H @HAVE_SYS_SELECT_H@
+#cmakedefine01 HAVE_SYS_SELECT_H
/*
* HAVE_SYS_STDTYPES_H:
@@ -239,7 +239,7 @@
* Use the poll() call provided on Linux and Irix instead of select()
*/
-#define USE_POLL @USE_POLL@
+#cmakedefine01 USE_POLL
/*
* Do we have various image libraries?
@@ -285,7 +285,7 @@
*/
#cmakedefine HAVE_PTHREAD @HAVE_PTHREAD@
-#define HAVE_PTHREAD_H @HAVE_PTHREAD_H@
+#cmakedefine01 HAVE_PTHREAD_H
/*
* Do we have the ALSA library?
diff -Naur fltk-1.3.x-r7216.patched//test/CMakeLists.txt
fltk-1.3.x-r7216/test/CMakeLists.txt
--- fltk-1.3.x-r7216.patched//test/CMakeLists.txt 2010-03-10
10:54:35.000000000 -0500
+++ fltk-1.3.x-r7216/test/CMakeLists.txt 2010-03-10 10:32:04.000000000
-0500
@@ -100,3 +100,7 @@
CREATE_EXAMPLE(gl_overlay gl_overlay.cxx "fltk;fltk_gl;${OPENGL_LIBRARIES}")
CREATE_EXAMPLE(shape shape.cxx "fltk;fltk_gl;${OPENGL_LIBRARIES}")
endif(HAVE_GL)
+
+install(DIRECTORY ${FLTK_BINARY_DIR}/bin/examples
+ DESTINATION ${PREFIX_DOC}
+ )
_______________________________________________
fltk-bugs mailing list
[email protected]
http://lists.easysw.com/mailman/listinfo/fltk-bugs
