cvs: gd /libgd/src CMakeLists.txt
[email protected] ("Pierre-Alain Joye") Thu, 17 Apr 2008 21:01:02 -0000
| Newsgroups | php.gd.cvs |
|---|---|
| Message-ID | <cvspajoye1208466062@cvsserver> |
pajoye Thu Apr 17 21:01:02 2008 UTC
Modified files:
/gd/libgd/src CMakeLists.txt
Log:
- don't add MS VC specific flag when mingw is used
http://cvs.php.net/viewvc.cgi/gd/libgd/src/CMakeLists.txt?r1=1.14&r2=1.15&diff_format=u
Index: gd/libgd/src/CMakeLists.txt
diff -u gd/libgd/src/CMakeLists.txt:1.14 gd/libgd/src/CMakeLists.txt:1.15
--- gd/libgd/src/CMakeLists.txt:1.14 Tue Jan 15 21:47:49 2008
+++ gd/libgd/src/CMakeLists.txt Thu Apr 17 21:01:01 2008
@@ -55,9 +55,9 @@
add_library(${GD_LIB} ${LIBGD_SRC_FILES})
-if (WIN32)
+if (WIN32 AND NOT MINGW AND NOT MSYS)
SET_TARGET_PROPERTIES(${GD_LIB} PROPERTIES LINK_FLAGS "/NODEFAULTLIB:msvcrt.lib")
-ENDIF(WIN32)
+ENDIF(WIN32 AND NOT MINGW AND NOT MSYS)
INCLUDE_DIRECTORIES(${CMAKE_BINARY_DIR}/ ${GD_SOURCE_DIR}/src)