cvs: gd /libgd CMakeLists.txt
[email protected] ("Pierre-Alain Joye")
| Newsgroups | php.gd.cvs |
|---|---|
| Message-ID | <cvspajoye1173282831@cvsserver> |
pajoye Wed Mar 7 15:53:51 2007 UTC
Modified files:
/gd/libgd CMakeLists.txt
Log:
- fix windows cmake support
- use BGDWIN32 for now, static build and other windows options will follow shortly
http://cvs.php.net/viewvc.cgi/gd/libgd/CMakeLists.txt?r1=1.1&r2=1.2&diff_format=u
Index: gd/libgd/CMakeLists.txt
diff -u gd/libgd/CMakeLists.txt:1.1 gd/libgd/CMakeLists.txt:1.2
--- gd/libgd/CMakeLists.txt:1.1 Tue Jan 23 23:54:15 2007
+++ gd/libgd/CMakeLists.txt Wed Mar 7 15:53:51 2007
@@ -7,6 +7,11 @@
ENABLE_TESTING()
endif(BUILD_TEST)
+if (WIN32)
+ SET(BGDWIN32 1)
+ ADD_DEFINITIONS(-DBGDWIN32)
+endif (WIN32)
+
if (USE_EXT_GD)
message("Using GD at: ${USE_EXT_GD}")
INCLUDE_DIRECTORIES(BEFORE ${GD_INCLUDE_DIR})
@@ -56,8 +61,6 @@
if (FREETYPE_FOUND)
INCLUDE_DIRECTORIES(${FREETYPE_INCLUDE_DIR})
- message(STATUS "ft2build: ${HAVE_FT2BUILD_H} ${FREETYPE_INCLUDE_DIR}")
- SET(HAVE_FT2BUILD_H 1)
SET(HAVE_LIBFREETYPE 1)
ENDIF(FREETYPE_FOUND)
@@ -148,9 +151,14 @@
CONFIGURE_FILE(config.h.cmake config.h ESCAPE_QUOTES)
- add_library(gd ${LIBGD_SRC_FILES})
- target_link_libraries(gd ${FREETYPE_LIBRARIES} ${PNG_LIBRARIES} ${JPEG_LIBRARIES} ${XPM_LIBRARIES} ${FONTCONFIG_LIBRARIES})
- SET(GD_LIB gd)
+ if (WIN32)
+ SET(GD_LIB bgd)
+ else(WIN32)
+ SET(GD_LIB gd)
+ endif(WIN32)
+ add_library(${GD_LIB} ${LIBGD_SRC_FILES})
+ target_link_libraries(${GD_LIB} ${FREETYPE_LIBRARIES} ${PNG_LIBRARIES} ${JPEG_LIBRARIES} ${XPM_LIBRARIES} ${FONTCONFIG_LIBRARIES})
+
endif (USE_EXT_GD)
add_subdirectory(tests)
\ No newline at end of file