cvs: gd /libgd/src CMakeLists.txt
[email protected] ("Pierre-Alain Joye") Fri, 18 Apr 2008 14:33:07 -0000
| Newsgroups | php.gd.cvs |
|---|---|
| Message-ID | <cvspajoye1208529187@cvsserver> |
pajoye Fri Apr 18 14:33:07 2008 UTC
Modified files:
/gd/libgd/src CMakeLists.txt
Log:
- build static version of libgd (we may add an option to disable it)
http://cvs.php.net/viewvc.cgi/gd/libgd/src/CMakeLists.txt?r1=1.15&r2=1.16&diff_format=u
Index: gd/libgd/src/CMakeLists.txt
diff -u gd/libgd/src/CMakeLists.txt:1.15 gd/libgd/src/CMakeLists.txt:1.16
--- gd/libgd/src/CMakeLists.txt:1.15 Thu Apr 17 21:01:01 2008
+++ gd/libgd/src/CMakeLists.txt Fri Apr 18 14:33:07 2008
@@ -53,7 +53,9 @@
wbmp.h
)
+
add_library(${GD_LIB} ${LIBGD_SRC_FILES})
+add_library(${GD_LIB_STATIC} STATIC ${LIBGD_SRC_FILES})
if (WIN32 AND NOT MINGW AND NOT MSYS)
SET_TARGET_PROPERTIES(${GD_LIB} PROPERTIES LINK_FLAGS "/NODEFAULTLIB:msvcrt.lib")
@@ -62,5 +64,6 @@
INCLUDE_DIRECTORIES(${CMAKE_BINARY_DIR}/ ${GD_SOURCE_DIR}/src)
target_link_libraries(${GD_LIB} ${FREETYPE_LIBRARIES} ${PNG_LIBRARIES} ${JPEG_LIBRARIES} ${TIFF_LIBRARIES} ${XPM_LIBRARIES} ${FONTCONFIG_LIBRARIES})
+target_link_libraries(${GD_LIB_STATIC} ${FREETYPE_LIBRARIES} ${PNG_LIBRARIES} ${JPEG_LIBRARIES} ${TIFF_LIBRARIES} ${XPM_LIBRARIES} ${FONTCONFIG_LIBRARIES})