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-r7243.patched//CMake/FLTKConfig.cmake.in
fltk-1.3.x-r7243/CMake/FLTKConfig.cmake.in
--- fltk-1.3.x-r7243.patched//CMake/FLTKConfig.cmake.in 1969-12-31
19:00:00.000000000 -0500
+++ fltk-1.3.x-r7243/CMake/FLTKConfig.cmake.in 2010-03-14 11:11:40.000000000
-0400
@@ -0,0 +1,21 @@
+#
+# automatically generated - do not edit
+
+set(FLTK_FOUND TRUE)
+set(FLTK_VERSION @FLTK_VERSION_FULL@)
+
+set(FLTK_FLUID_EXECUTABLE @FLTK_FLUID_PATH@)
+
+if(NOT "@EXE_LINKER_FLAGS@" STREQUAL "")
+ set(FLTK_EXE_LINKER_FLAGS "@EXE_LINKER_FLAGS@")
+endif(NOT "@EXE_LINKER_FLAGS@" STREQUAL "")
+
+set(FLTK_USE_FILE @PREFIX_CONFIG@/UseFLTK.cmake)
+
+set(FLTK_BIN_DIR @PREFIX_BIN@)
+set(FLTK_LIB_DIR @PREFIX_LIB@)
+set(FLTK_INCLUDE_DIR @PREFIX_INCLUDE@)
+set(FLTK_DATA_DIR @PREFIX_DATA@)
+set(FLTK_DOC_DIR @PREFIX_DOC@)
+
+include(@PREFIX_CONFIG@/FLTKLibraries.cmake)
diff -Naur fltk-1.3.x-r7243.patched//CMake/UseFLTK.cmake.in
fltk-1.3.x-r7243/CMake/UseFLTK.cmake.in
--- fltk-1.3.x-r7243.patched//CMake/UseFLTK.cmake.in 1969-12-31
19:00:00.000000000 -0500
+++ fltk-1.3.x-r7243/CMake/UseFLTK.cmake.in 2010-03-14 10:50:22.000000000
-0400
@@ -0,0 +1,8 @@
+#
+# automatically generated - do not edit
+
+include_directories(@PREFIX_INCLUDE@)
+
+if(FLTK_EXE_LINKER_FLAGS)
+ list(APPEND CMAKE_EXE_LINKER_FLAGS ${FLTK_EXE_LINKER_FLAGS})
+endif(FLTK_EXE_LINKER_FLAGS)
diff -Naur fltk-1.3.x-r7243.patched//CMakeLists.txt
fltk-1.3.x-r7243/CMakeLists.txt
--- fltk-1.3.x-r7243.patched//CMakeLists.txt 2010-03-12 15:42:17.000000000
-0500
+++ fltk-1.3.x-r7243/CMakeLists.txt 2010-03-15 02:11:58.000000000 -0400
@@ -47,7 +47,6 @@
include_directories(${FLTK_BINARY_DIR})
-
# If this is out-of-source build, then copy FL directory
if(NOT ${FLTK_SOURCE_DIR} STREQUAL ${FLTK_BINARY_DIR})
file(GLOB FLTK_HEADER_FILES ${FLTK_SOURCE_DIR}/FL/*.[hHr])
@@ -83,15 +82,22 @@
TEST_BIG_ENDIAN(WORDS_BIGENDIAN)
if(APPLE)
- set(FLTK_APPLE 1)
- set(FLTK_QUARTZ 1)
-else()
- set(FLTK_QUARTZ 0)
+ set(USE_QUARTZ ON)
endif(APPLE)
-if(WIN32 AND NOT CYGWIN AND NOT BORLAND AND NOT MINGW)
- add_definitions(-DWIN32_LEAN_AND_MEAN)
-endif(WIN32 AND NOT CYGWIN AND NOT BORLAND AND NOT MINGW)
+if(WIN32)
+ if(MSVC)
+ add_definitions(-DWIN32_LEAN_AND_MEAN)
+ add_definitions(-D_CRT_SECURE_NO_WARNINGS)
+ set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS}
-subsystem:windows")
+ endif(MSVC)
+ if(CMAKE_C_COMPILER_ID STREQUAL GNU)
+ set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS}
-Wl,-subsystem,windows")
+ endif(CMAKE_C_COMPILER_ID STREQUAL GNU)
+ if(MINGW)
+ include_directories(/mingw/includes)
+ endif(MINGW)
+endif(WIN32)
#######################################################################
# size of ints
@@ -199,16 +205,19 @@
CHECK_FUNCTION_EXISTS(scandir HAVE_SCANDIR)
CHECK_FUNCTION_EXISTS(snprintf HAVE_SNPRINTF)
+
+# not really true but we convert strcasecmp calls to _stricmp calls in
flstring.h
+if(MSVC)
+ set(HAVE_STRCASECMP 1)
+endif(MSVC)
CHECK_FUNCTION_EXISTS(strcasecmp HAVE_STRCASECMP)
+
CHECK_FUNCTION_EXISTS(strlcat HAVE_STRLCAT)
CHECK_FUNCTION_EXISTS(strlcpy HAVE_STRLCPY)
CHECK_FUNCTION_EXISTS(strtoll HAVE_STRTOLL)
CHECK_FUNCTION_EXISTS(vsnprintf HAVE_VSNPRINTF)
set(CMAKE_REQUIRED_LIBRARIES)
-mark_as_advanced(HAVE_DLSYM HAVE_SCANDIR HAVE_SNPRINTF HAVE_STRCASECMP)
-mark_as_advanced(HAVE_STRLCAT HAVE_STRLCPY HAVE_VSNPRINTF)
-mark_as_advanced(HAVE_LOCALECONV HAVE_STRCASECMP)
if(NOT HAVE_SCANDIR_POSIX)
set(MSG "POSIX compatible scandir")
@@ -304,6 +313,18 @@
endif(OPTION_PREFIX_DOC)
#######################################################################
+set(OPTION_PREFIX_CONFIG ""
+ CACHE STRING
+ "where to install CMake config files - leave empty to use
{CMAKE_INSTALL_PREFIX}/lib/FLTK-${FLTK_VERSION}"
+ )
+
+if(OPTION_PREFIX_CONFIG)
+ set(PREFIX_CONFIG ${OPTION_PREFIX_CONFIG} CACHE INTERNAL "" FORCE)
+else()
+ set(PREFIX_CONFIG ${CMAKE_INSTALL_PREFIX}/lib/FLTK-${FLTK_VERSION} CACHE
INTERNAL "" FORCE)
+endif(OPTION_PREFIX_CONFIG)
+
+#######################################################################
if(CMAKE_HOST_UNIX)
set(OPTION_PREFIX_MAN ""
CACHE STRING
@@ -370,23 +391,21 @@
endif(LIB_CAIRO AND OPTION_CAIROEXT AND PKG_CAIRO_FOUND)
#######################################################################
-option(OPTION_USE_GL "use OpenGL" ON)
+set(HAVE_GL LIB_GL OR LIB_MesaGL)
-set(FLTK_HAVE_GL LIB_GL OR LIB_MesaGL)
+if(HAVE_GL)
+ option(OPTION_USE_GL "use OpenGL" ON)
+endif(HAVE_GL)
-if(OPTION_USE_GL AND FLTK_HAVE_GL)
+if(OPTION_USE_GL)
include(FindOpenGL)
-endif(OPTION_USE_GL AND FLTK_HAVE_GL)
+endif(OPTION_USE_GL)
-if(OPTION_USE_GL AND OPENGL_FOUND)
- set(HAVE_GL 1)
+if(OPENGL_FOUND)
set(CMAKE_REQUIRED_INCLUDES ${OPENGL_INCLUDE_DIR}/GL)
set(CMAKE_REQUIRED_LIBRARIES -lGLU -lGL)
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)
+endif(OPENGL_FOUND)
#######################################################################
option(OPTION_USE_THREADS "use multi-threading" ON)
@@ -426,18 +445,16 @@
if(OPTION_USE_SYSTEM_LIBJPEG AND JPEG_FOUND)
set(FLTK_JPEG_LIBRARIES ${JPEG_LIBRARIES})
include_directories(${JPEG_INCLUDE_DIR})
+else()
+ add_subdirectory(jpeg)
+ set(FLTK_JPEG_LIBRARIES fltk_jpeg)
+ include_directories(${FLTK_SOURCE_DIR}/jpeg)
endif(OPTION_USE_SYSTEM_LIBJPEG AND JPEG_FOUND)
if(OPTION_USE_SYSTEM_LIBJPEG AND NOT JPEG_FOUND)
message(STATUS "\ncannot find system jpeg library - using built-in\n")
endif(OPTION_USE_SYSTEM_LIBJPEG AND NOT JPEG_FOUND)
-if(NOT JPEG_FOUND)
- add_subdirectory(jpeg)
- set(FLTK_JPEG_LIBRARIES fltk_jpeg)
- include_directories(${FLTK_SOURCE_DIR}/jpeg)
-endif(NOT JPEG_FOUND)
-
set(HAVE_LIBJPEG 1)
#######################################################################
@@ -450,18 +467,17 @@
if(OPTION_USE_SYSTEM_ZLIB AND ZLIB_FOUND)
set(FLTK_ZLIB_LIBRARIES ${ZLIB_LIBRARIES})
include_directories(${ZLIB_INCLUDE_DIRS})
+else()
+ add_subdirectory(zlib)
+ set(FLTK_ZLIB_LIBRARIES fltk_z)
+ set(ZLIB_INCLUDE_DIR ${FLTK_SOURCE_DIR}/zlib)
+ include_directories(${FLTK_SOURCE_DIR}/zlib)
endif(OPTION_USE_SYSTEM_ZLIB AND ZLIB_FOUND)
if(OPTION_USE_SYSTEM_ZLIB AND NOT ZLIB_FOUND)
message(STATUS "\ncannot find system zlib library - using built-in\n")
endif(OPTION_USE_SYSTEM_ZLIB AND NOT ZLIB_FOUND)
-if(NOT ZLIB_FOUND)
- add_subdirectory(zlib)
- set(FLTK_ZLIB_LIBRARIES fltk_z)
- include_directories(${FLTK_SOURCE_DIR}/zlib)
-endif(NOT ZLIB_FOUND)
-
set(HAVE_LIBZ 1)
#######################################################################
@@ -475,20 +491,18 @@
set(FLTK_PNG_LIBRARIES ${PNG_LIBRARIES})
include_directories(${PNG_INCLUDE_DIR})
add_definitions(${PNG_DEFINITIONS})
-endif(OPTION_USE_SYSTEM_LIBPNG AND PNG_FOUND)
-
-if(OPTION_USE_SYSTEM_LIBPNG AND NOT PNG_FOUND)
- message(STATUS "\ncannot find system png library - using built-in\n")
-endif(OPTION_USE_SYSTEM_LIBPNG AND NOT PNG_FOUND)
-
-if(NOT PNG_FOUND)
+else()
add_subdirectory(png)
set(FLTK_PNG_LIBRARIES fltk_png)
set(HAVE_PNG_H 1)
set(HAVE_PNG_GET_VALID 1)
set(HAVE_PNG_SET_TRNS_TO_ALPHA 1)
include_directories(${FLTK_SOURCE_DIR}/png)
-endif(NOT PNG_FOUND)
+endif(OPTION_USE_SYSTEM_LIBPNG AND PNG_FOUND)
+
+if(OPTION_USE_SYSTEM_LIBPNG AND NOT PNG_FOUND)
+ message(STATUS "\ncannot find system png library - using built-in\n")
+endif(OPTION_USE_SYSTEM_LIBPNG AND NOT PNG_FOUND)
set(HAVE_LIBPNG 1)
@@ -498,11 +512,9 @@
endif(X11_Xinerama_FOUND)
if(OPTION_USE_XINERAMA)
- set(FLTK_USE_XINERAMA 1)
+ set(HAVE_XINERAMA X11_Xinerama_FOUND)
include_directories(${X11_Xinerama_INCLUDE_PATH})
list(APPEND FLTK_LDLIBS -lXinerama)
-else()
- set(FLTK_USE_XINERAMA 0)
endif(OPTION_USE_XINERAMA)
#######################################################################
@@ -511,28 +523,56 @@
endif(X11_Xft_FOUND)
if(OPTION_USE_XFT)
- set(FLTK_USE_XFT 1)
+ set(USE_XFT X11_Xft_FOUND)
list(APPEND FLTK_LDLIBS -lXft)
-else()
- set(FLTK_USE_XFT 0)
endif(OPTION_USE_XFT)
#######################################################################
if(X11_FOUND)
option(OPTION_USE_XDBE "use lib Xdbe" ON)
-
- mark_as_advanced(HAVE_XDBE_H)
endif(X11_FOUND)
if(OPTION_USE_XDBE AND HAVE_XDBE_H)
set(HAVE_XDBE 1)
-else()
- set(HAVE_XDBE 0)
endif(OPTION_USE_XDBE AND HAVE_XDBE_H)
#######################################################################
# final setup and config
#######################################################################
+# Set the fluid executable path
+if(CMAKE_CROSSCOMPILING)
+ find_file(FLUID_PATH
+ NAMES fluid fluid.exe
+ PATHS ENV PATH
+ NO_CMAKE_FIND_ROOT_PATH
+ )
+ add_executable(fluid IMPORTED)
+ set(FLTK_FLUID_EXECUTABLE fluid)
+ set(FLTK_FLUID_PATH ${FLUID_PATH})
+ set_target_properties(fluid
+ PROPERTIES IMPORTED_LOCATION ${FLUID_PATH}
+ )
+else()
+ add_subdirectory(fluid)
+ set(FLTK_FLUID_EXECUTABLE fluid)
+ set(FLTK_FLUID_PATH ${PREFIX_BIN}/${FLTK_FLUID_EXECUTABLE})
+endif(CMAKE_CROSSCOMPILING)
+
+add_subdirectory(src)
+
+# generate FLTKConfig.cmake
+string(REPLACE ";" " " EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS}")
+configure_file(${FLTK_SOURCE_DIR}/CMake/FLTKConfig.cmake.in
+ ${EXECUTABLE_OUTPUT_PATH}/FLTKConfig.cmake
+ @ONLY
+ )
+
+# generate UseFLTK.cmake
+configure_file(${FLTK_SOURCE_DIR}/CMake/UseFLTK.cmake.in
+ ${EXECUTABLE_OUTPUT_PATH}/UseFLTK.cmake
+ @ONLY
+ )
+
# generate config.h
configure_file("${FLTK_SOURCE_DIR}/configh.cmake.in"
"${FLTK_BINARY_DIR}/config.h" @ONLY
@@ -564,27 +604,8 @@
)
#######################################################################
-# build
+# build examples
#######################################################################
-add_subdirectory(src)
-
-# Set the fluid executable path
-if(CMAKE_CROSSCOMPILING)
- find_file(FLUID_PATH
- NAMES fluid fluid.exe
- PATHS ENV PATH
- NO_CMAKE_FIND_ROOT_PATH
- )
- add_executable(fluid IMPORTED)
- set(FLTK_FLUID_EXECUTABLE fluid)
- set_target_properties(fluid
- PROPERTIES IMPORTED_LOCATION ${FLUID_PATH}
- )
-else()
- add_subdirectory(fluid)
- set(FLTK_FLUID_EXECUTABLE fluid)
-endif(CMAKE_CROSSCOMPILING)
-
if(OPTION_BUILD_EXAMPLES)
add_subdirectory(test)
endif(OPTION_BUILD_EXAMPLES)
@@ -592,13 +613,9 @@
#######################################################################
# installation
#######################################################################
-install(EXPORT fltk-install
- DESTINATION ${PREFIX_LIB}/FLTK-${FLTK_VERSION}
- FILE FLTKConfig.cmake
- )
install(DIRECTORY ${FLTK_BINARY_DIR}/FL
- DESTINATION include USE_SOURCE_PERMISSIONS
+ DESTINATION ${PREFIX_INCLUDE} USE_SOURCE_PERMISSIONS
)
install(DIRECTORY ${FLTK_BINARY_DIR}/Fl
@@ -610,6 +627,19 @@
OPTIONAL
)
+install(EXPORT fltk-install
+ DESTINATION ${PREFIX_CONFIG}
+ FILE FLTKLibraries.cmake
+ )
+
+install(FILES ${EXECUTABLE_OUTPUT_PATH}/FLTKConfig.cmake
+ DESTINATION ${PREFIX_CONFIG}
+ )
+
+install(FILES ${EXECUTABLE_OUTPUT_PATH}/UseFLTK.cmake
+ DESTINATION ${PREFIX_CONFIG}
+ )
+
if(CMAKE_HOST_UNIX)
macro(INSTALL_MAN FILE LEVEL)
install(FILES
@@ -627,3 +657,4 @@
INSTALL_MAN(sudoku 6)
endif(CMAKE_HOST_UNIX)
+
diff -Naur fltk-1.3.x-r7243.patched//configh.cmake.in
fltk-1.3.x-r7243/configh.cmake.in
--- fltk-1.3.x-r7243.patched//configh.cmake.in 2010-03-12 15:42:17.000000000
-0500
+++ fltk-1.3.x-r7243/configh.cmake.in 2010-03-12 15:43:47.000000000 -0500
@@ -73,7 +73,7 @@
* Do you have the OpenGL glXGetProcAddressARB() function?
*/
-#cmakedefine01 HAVE_GLXGETPROCADDRESSARB
+#cmakedefine HAVE_GLXGETPROCADDRESSARB
/*
* USE_COLORMAP:
@@ -90,7 +90,7 @@
* Do we have the Xinerama library to support multi-head displays?
*/
-#define HAVE_XINERAMA @FLTK_USE_XINERAMA@
+#cmakedefine01 HAVE_XINERAMA
/*
* USE_XFT
@@ -98,7 +98,7 @@
* Use the new Xft library to draw anti-aliased text.
*/
-#define USE_XFT @FLTK_USE_XFT@
+#cmakedefine01 USE_XFT
/*
* HAVE_XDBE:
@@ -106,7 +106,7 @@
* Do we have the X double-buffer extension?
*/
-#define HAVE_XDBE @HAVE_XDBE@
+#cmakedefine01 HAVE_XDBE
/*
* USE_XDBE:
@@ -126,7 +126,7 @@
* other operating systems.
*/
-#define USE_QUARTZ @FLTK_QUARTZ@
+#cmakedefine USE_QUARTZ
#cmakedefine __APPLE_QUARTZ__ @__APPLE_QUARTZ__@
#cmakedefine __APPLE_COCOA__ @__APPLE_COCOA__@
#cmakedefine __APPLE_QD__ @__APPLE_QD__@
diff -Naur fltk-1.3.x-r7243.patched//fltk-config.cmake.in
fltk-1.3.x-r7243/fltk-config.cmake.in
--- fltk-1.3.x-r7243.patched//fltk-config.cmake.in 2010-03-12
15:41:40.000000000 -0500
+++ fltk-1.3.x-r7243/fltk-config.cmake.in 2010-03-12 15:43:47.000000000
-0500
@@ -40,9 +40,9 @@
pref...@cmake_install_prefix@
exec_prefix=${prefix}
exec_prefix_set=no
-bind...@cmake_install_prefix@/bin
-included...@cmake_install_prefix@/include
-libd...@cmake_install_prefix@/lib
+bind...@prefix_bin@
+included...@cprefix_include@
+libd...@prefix_lib@
srcdir=.
# compiler names
diff -Naur fltk-1.3.x-r7243.patched//src/CMakeLists.txt
fltk-1.3.x-r7243/src/CMakeLists.txt
--- fltk-1.3.x-r7243.patched//src/CMakeLists.txt 2010-03-12
15:41:58.000000000 -0500
+++ fltk-1.3.x-r7243/src/CMakeLists.txt 2010-03-15 02:35:54.000000000 -0400
@@ -203,10 +203,26 @@
target_link_libraries(fltk ${CMAKE_THREAD_LIBS_INIT})
target_link_libraries(fltk ${X11_LIBRARIES})
+if(WIN32)
+ target_link_libraries(fltk comctl32)
+endif(WIN32)
+
if(HAVE_CAIRO)
target_link_libraries(fltk ${PKG_CAIRO_LIBRARIES})
ENDif(HAVE_CAIRO)
+if(OPTION_USE_XINERAMA)
+ target_link_libraries(fltk ${X11_Xinerama_LIB})
+endif(OPTION_USE_XINERAMA)
+
+if(OPTION_USE_XFT)
+ target_link_libraries(fltk ${X11_Xft_LIB})
+endif(OPTION_USE_XFT)
+
+if(LIB_fontconfig)
+ target_link_libraries(fltk ${LIB_fontconfig})
+endif(LIB_fontconfig)
+
add_library(fltk_forms ${FLCPPFILES})
target_link_libraries(fltk_forms fltk)
set_target_properties(fltk_forms
@@ -230,7 +246,7 @@
DESTINATION ${PREFIX_LIB}
)
-if(HAVE_GL)
+if(OPENGL_FOUND)
add_library(fltk_gl ${GLCPPFILES})
target_link_libraries(fltk_gl fltk ${OPENGL_LIBRARIES})
set_target_properties(fltk_gl
@@ -246,31 +262,47 @@
EXPORT fltk-install
DESTINATION ${PREFIX_LIB}
)
-endif(HAVE_GL)
+endif(OPENGL_FOUND)
if(OPTION_BUILD_SHARED_LIBS)
add_library(fltk_SHARED SHARED ${CPPFILES} ${CFILES})
set_target_properties(fltk_SHARED
- PROPERTIES
+ PROPERTIES CLEAN_DIRECT_OUTPUT 1
OUTPUT_NAME fltk
- CLEAN_DIRECT_OUTPUT 1
- VERSION ${FLTK_VERSION_MAJOR}.${FLTK_VERSION_MINOR}
- SOVERSION ${FLTK_VERSION_PATCH})
+ PREFIX lib
+ VERSION ${FLTK_VERSION_MAJOR}.${FLTK_VERSION_MINOR}
+ SOVERSION ${FLTK_VERSION_PATCH})
-target_link_libraries(fltk ${CMAKE_THREAD_LIBS_INIT})
-target_link_libraries(fltk ${X11_LIBRARIES})
+target_link_libraries(fltk_SHARED ${CMAKE_THREAD_LIBS_INIT})
+target_link_libraries(fltk_SHARED ${X11_LIBRARIES})
+
+if(WIN32)
+ target_link_libraries(fltk_SHARED comctl32)
+endif(WIN32)
if(HAVE_CAIRO)
- target_link_libraries(fltk ${PKG_CAIRO_LIBRARIES})
+ target_link_libraries(fltk_SHARED ${PKG_CAIRO_LIBRARIES})
ENDif(HAVE_CAIRO)
+if(OPTION_USE_XINERAMA)
+ target_link_libraries(fltk_SHARED ${X11_Xinerama_LIB})
+endif(OPTION_USE_XINERAMA)
+
+if(OPTION_USE_XFT)
+ target_link_libraries(fltk_SHARED ${X11_Xft_LIB})
+endif(OPTION_USE_XFT)
+
+if(LIB_fontconfig)
+ target_link_libraries(fltk_SHARED ${LIB_fontconfig})
+endif(LIB_fontconfig)
+
add_library(fltk_forms_SHARED SHARED ${FLCPPFILES})
target_link_libraries(fltk_forms_SHARED fltk)
set_target_properties(fltk_forms_SHARED
- PROPERTIES
+ PROPERTIES CLEAN_DIRECT_OUTPUT 1
OUTPUT_NAME fltk_forms
- CLEAN_DIRECT_OUTPUT 1
+ PREFIX lib
VERSION ${FLTK_VERSION_MAJOR}.${FLTK_VERSION_MINOR}
SOVERSION ${FLTK_VERSION_PATCH})
@@ -278,9 +310,9 @@
target_link_libraries(fltk_images_SHARED fltk ${FLTK_PNG_LIBRARIES}
${FLTK_JPEG_LIBRARIES} ${FLTK_ZLIB_LIBRARIES})
set_target_properties(fltk_images_SHARED
- PROPERTIES
+ PROPERTIES CLEAN_DIRECT_OUTPUT 1
OUTPUT_NAME fltk_images
- CLEAN_DIRECT_OUTPUT 1
+ PREFIX lib
VERSION ${FLTK_VERSION_MAJOR}.${FLTK_VERSION_MINOR}
SOVERSION ${FLTK_VERSION_PATCH})
@@ -292,13 +324,13 @@
DESTINATION ${PREFIX_LIB}
)
-if(HAVE_GL)
+if(OPENGL_FOUND)
add_library(fltk_gl_SHARED SHARED ${GLCPPFILES})
target_link_libraries(fltk_gl_SHARED fltk ${OPENGL_LIBRARIES})
set_target_properties(fltk_gl_SHARED
- PROPERTIES
+ PROPERTIES CLEAN_DIRECT_OUTPUT 1
OUTPUT_NAME fltk_gl
- CLEAN_DIRECT_OUTPUT 1
+ PREFIX lib
VERSION ${FLTK_VERSION_MAJOR}.${FLTK_VERSION_MINOR}
SOVERSION ${FLTK_VERSION_PATCH}
)
@@ -310,6 +342,6 @@
EXPORT fltk-install
DESTINATION ${PREFIX_LIB}
)
-endif(HAVE_GL)
+endif(OPENGL_FOUND)
endif(OPTION_BUILD_SHARED_LIBS)
diff -Naur fltk-1.3.x-r7243.patched//zlib/CMakeLists.txt
fltk-1.3.x-r7243/zlib/CMakeLists.txt
--- fltk-1.3.x-r7243.patched//zlib/CMakeLists.txt 2010-03-12
15:41:40.000000000 -0500
+++ fltk-1.3.x-r7243/zlib/CMakeLists.txt 2010-03-15 02:06:17.000000000
-0400
@@ -14,7 +14,6 @@
set_target_properties(fltk_z
PROPERTIES
OUTPUT_NAME fltk_z
- PREFIX lib
CLEAN_DIRECT_OUTPUT 1
VERSION ${FLTK_VERSION}
SOVERSION ${FLTK_VERSION_PATCH})
_______________________________________________
fltk-bugs mailing list
[email protected]
http://lists.easysw.com/mailman/listinfo/fltk-bugs
