[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [40165] trunk/blender: fix for error linking opencollada on linux.
Campbell Barton
ideasman42 at gmail.com
Mon Sep 12 15:58:14 CEST 2011
Revision: 40165
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=40165
Author: campbellbarton
Date: 2011-09-12 13:58:13 +0000 (Mon, 12 Sep 2011)
Log Message:
-----------
fix for error linking opencollada on linux.
Modified Paths:
--------------
trunk/blender/CMakeLists.txt
trunk/blender/build_files/cmake/macros.cmake
Modified: trunk/blender/CMakeLists.txt
===================================================================
--- trunk/blender/CMakeLists.txt 2011-09-12 13:20:24 UTC (rev 40164)
+++ trunk/blender/CMakeLists.txt 2011-09-12 13:58:13 UTC (rev 40165)
@@ -702,7 +702,7 @@
${LIBDIR}/opencollada/lib/ftoa.lib
${LIBDIR}/opencollada/lib/UTF.lib
)
- set(PCRE_LIB
+ set(PCRE_LIBRARIES
${LIBDIR}/opencollada/lib/pcre.lib
)
endif()
@@ -844,7 +844,7 @@
)
set(OPENCOLLADA_LIBPATH ${OPENCOLLADA}/lib ${OPENCOLLADA}/lib)
set(OPENCOLLADA_LIBRARIES OpenCOLLADAStreamWriter OpenCOLLADASaxFrameworkLoader OpenCOLLADAFramework OpenCOLLADABaseUtils GeneratedSaxParser UTF MathMLSolver expat pcre buffer ftoa)
- set(PCRE_LIB pcre)
+ set(PCRE_LIBRARIES pcre)
endif()
if(WITH_CODEC_FFMPEG)
@@ -1066,7 +1066,7 @@
#pcre is bundled with openCollada
#set(PCRE ${LIBDIR}/pcre)
#set(PCRE_LIBPATH ${PCRE}/lib)
- set(PCRE_LIB pcre)
+ set(PCRE_LIBRARIES pcre)
#libxml2 is used
#set(EXPAT ${LIBDIR}/expat)
#set(EXPAT_LIBPATH ${EXPAT}/lib)
Modified: trunk/blender/build_files/cmake/macros.cmake
===================================================================
--- trunk/blender/build_files/cmake/macros.cmake 2011-09-12 13:20:24 UTC (rev 40164)
+++ trunk/blender/build_files/cmake/macros.cmake 2011-09-12 13:58:13 UTC (rev 40165)
@@ -295,10 +295,10 @@
target_link_libraries_optimized(${target} "${OPENCOLLADA_LIBRARIES}")
unset(OPENCOLLADA_LIBRARIES_DEBUG)
- file_list_suffix(PCRE_LIB_DEBUG "${PCRE_LIB}" "_d")
- target_link_libraries_debug(${target} "${PCRE_LIB_DEBUG}")
- target_link_libraries_optimized(${target} "${PCRE_LIB}")
- unset(PCRE_LIB_DEBUG)
+ file_list_suffix(PCRE_LIBRARIES_DEBUG "${PCRE_LIBRARIES}" "_d")
+ target_link_libraries_debug(${target} "${PCRE_LIBRARIES_DEBUG}")
+ target_link_libraries_optimized(${target} "${PCRE_LIBRARIES}")
+ unset(PCRE_LIBRARIES_DEBUG)
if(EXPAT_LIB)
file_list_suffix(EXPAT_LIB_DEBUG "${EXPAT_LIB}" "_d")
@@ -309,7 +309,8 @@
else()
target_link_libraries(${target}
${OPENCOLLADA_LIBRARIES}
- ${PCRE_LIB}
+ ${PCRE_LIBRARIES}
+ ${XML2_LIBRARIES}
${EXPAT_LIB})
endif()
endif()
More information about the Bf-blender-cvs
mailing list