Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2011-09-30 19:21:10 +0400
committerCampbell Barton <ideasman42@gmail.com>2011-09-30 19:21:10 +0400
commitca2528d55117cacc4e811a7d9e0c0a3bc69902b7 (patch)
treebb3d04e17d5a2c55d23afbe527544f4b2d866405 /build_files
parent31363c33249e998fd170fa7f59422fc18397b5a4 (diff)
removing duplicate library linking from cmake, fingers crossed that this wont break on other systems (works here).
Diffstat (limited to 'build_files')
-rw-r--r--build_files/cmake/macros.cmake8
1 files changed, 1 insertions, 7 deletions
diff --git a/build_files/cmake/macros.cmake b/build_files/cmake/macros.cmake
index ef4edca1b22..8a665405e72 100644
--- a/build_files/cmake/macros.cmake
+++ b/build_files/cmake/macros.cmake
@@ -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})