[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [40718] trunk/blender/build_files/cmake/ macros.cmake: removing duplicate library linking from cmake, fingers crossed that this wont break on other systems (works here).
Campbell Barton
ideasman42 at gmail.com
Fri Sep 30 17:21:10 CEST 2011
Revision: 40718
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=40718
Author: campbellbarton
Date: 2011-09-30 15:21:10 +0000 (Fri, 30 Sep 2011)
Log Message:
-----------
removing duplicate library linking from cmake, fingers crossed that this wont break on other systems (works here).
Modified Paths:
--------------
trunk/blender/build_files/cmake/macros.cmake
Modified: trunk/blender/build_files/cmake/macros.cmake
===================================================================
--- trunk/blender/build_files/cmake/macros.cmake 2011-09-30 15:15:57 UTC (rev 40717)
+++ trunk/blender/build_files/cmake/macros.cmake 2011-09-30 15:21:10 UTC (rev 40718)
@@ -213,6 +213,7 @@
${JPEG_LIBRARIES}
${PNG_LIBRARIES}
${ZLIB_LIBRARIES}
+ ${FREETYPE_LIBRARY}
${PLATFORM_LINKLIBS})
# since we are using the local libs for python when compiling msvc projects, we need to add _d when compiling debug versions
@@ -233,13 +234,6 @@
target_link_libraries(${target} ${GLEW_LIBRARY})
endif()
- target_link_libraries(${target}
- ${OPENGL_glu_LIBRARY}
- ${JPEG_LIBRARIES}
- ${PNG_LIBRARIES}
- ${ZLIB_LIBRARIES}
- ${FREETYPE_LIBRARY})
-
if(WITH_INTERNATIONAL)
target_link_libraries(${target} ${GETTEXT_LIB})
More information about the Bf-blender-cvs
mailing list