From: Werner S. <sm...@us...> - 2006-10-31 19:51:19
|
Update of /cvsroot/plplot/plplot/cmake/modules In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32015/cmake/modules Modified Files: gd.cmake Log Message: Instead of splitting the libs ourselves, let cmake do that. Just add all libraries with set(gd_LINK_FLAGS ${GD_LIBRARIES}) - old code still commented. Works with win32 compilers and cygwin. Hopefully also linux. Index: gd.cmake =================================================================== RCS file: /cvsroot/plplot/plplot/cmake/modules/gd.cmake,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- gd.cmake 2 Aug 2006 17:17:58 -0000 1.10 +++ gd.cmake 31 Oct 2006 19:51:17 -0000 1.11 @@ -73,15 +73,15 @@ endforeach(DIR ${GD_INCLUDE_DIR}) # Generate library link commands - set(gd_LINK_FLAGS) - foreach(DIR ${GD_LIBRARY_DIR}) - set(gd_LINK_FLAGS "${gd_LINK_FLAGS} -L${DIR}") - endforeach(DIR ${GD_LIBRARY_DIR}) - foreach(LIB ${GD_LIBRARIES}) - get_filename_component(LIBNAME ${LIB} NAME_WE) - string(REGEX REPLACE "^lib" "-l" LIBSHORT ${LIBNAME}) - set(gd_LINK_FLAGS "${gd_LINK_FLAGS} ${LIBSHORT}") - endforeach(LIB ${GD_LIBRARIES}) + set(gd_LINK_FLAGS ${GD_LIBRARIES}) + #foreach(DIR ${GD_LIBRARY_DIR}) + # set(gd_LINK_FLAGS "${gd_LINK_FLAGS} -L${DIR}") + #endforeach(DIR ${GD_LIBRARY_DIR}) + #foreach(LIB ${GD_LIBRARIES}) + # get_filename_component(LIBNAME ${LIB} NAME_WE) + # string(REGEX REPLACE "^lib" "-l" LIBSHORT ${LIBNAME}) + # set(gd_LINK_FLAGS "${gd_LINK_FLAGS} ${LIBSHORT}") + #endforeach(LIB ${GD_LIBRARIES}) set(DRIVERS_LINK_FLAGS ${DRIVERS_LINK_FLAGS} ${gd_LINK_FLAGS}) endif(PLD_png OR PLD_jpeg OR PLD_gif) |