[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [34494] trunk/blender/build_files/cmake/ macros.cmake: cmake attempted fix before didnt work (I cant test on OSX), this should fix.
Campbell Barton
ideasman42 at gmail.com
Wed Jan 26 08:34:18 CET 2011
Revision: 34494
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=34494
Author: campbellbarton
Date: 2011-01-26 07:34:17 +0000 (Wed, 26 Jan 2011)
Log Message:
-----------
cmake attempted fix before didnt work (I cant test on OSX), this should fix.
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-01-26 06:41:44 UTC (rev 34493)
+++ trunk/blender/build_files/cmake/macros.cmake 2011-01-26 07:34:17 UTC (rev 34494)
@@ -121,7 +121,7 @@
target)
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${PLATFORM_LINKFLAGS} ")
- target_link_libraries(${target} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY} ${JPEG_LIBRARY} ${PNG_LIBRARIES} ${ZLIB_LIBRARIES} ${LLIBS})
+ target_link_libraries(${target} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY} ${JPEG_LIBRARIES} ${PNG_LIBRARIES} ${ZLIB_LIBRARIES} ${LLIBS})
# since we are using the local libs for python when compiling msvc projects, we need to add _d when compiling debug versions
if(WITH_PYTHON)
@@ -135,7 +135,7 @@
endif()
endif()
- target_link_libraries(${target} ${OPENGL_glu_LIBRARY} ${JPEG_LIBRARY} ${PNG_LIBRARIES} ${ZLIB_LIBRARIES})
+ target_link_libraries(${target} ${OPENGL_glu_LIBRARY} ${JPEG_LIBRARIES} ${PNG_LIBRARIES} ${ZLIB_LIBRARIES})
target_link_libraries(${target} ${FREETYPE_LIBRARY})
if(WITH_INTERNATIONAL)
More information about the Bf-blender-cvs
mailing list