removing duplicate library linking from cmake, fingers crossed that this wont break...
authorCampbell Barton <ideasman42@gmail.com>
Fri, 30 Sep 2011 15:21:10 +0000 (15:21 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Fri, 30 Sep 2011 15:21:10 +0000 (15:21 +0000)
build_files/cmake/macros.cmake

index ef4edca1b220982ecaa6288d1032f5c1e26b581e..8a665405e72fdd05d1a1f60638724a0d77c22b75 100644 (file)
@@ -213,6 +213,7 @@ macro(setup_liblinks
                        ${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 @@ macro(setup_liblinks
                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})