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-12 17:58:13 +0400
committerCampbell Barton <ideasman42@gmail.com>2011-09-12 17:58:13 +0400
commit297f14a1d623832f4d77ca0740f3ce4bad7fe767 (patch)
treec4eb3032ae9d8e74a41fcd7295f806453964b1e3 /build_files
parent1dcf9c636ce3eef99279925c3ea87a34c46ec7c4 (diff)
fix for error linking opencollada on linux.
Diffstat (limited to 'build_files')
-rw-r--r--build_files/cmake/macros.cmake11
1 files changed, 6 insertions, 5 deletions
diff --git a/build_files/cmake/macros.cmake b/build_files/cmake/macros.cmake
index d09215d040d..aec7a9fd96c 100644
--- a/build_files/cmake/macros.cmake
+++ b/build_files/cmake/macros.cmake
@@ -295,10 +295,10 @@ macro(setup_liblinks
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 @@ macro(setup_liblinks
else()
target_link_libraries(${target}
${OPENCOLLADA_LIBRARIES}
- ${PCRE_LIB}
+ ${PCRE_LIBRARIES}
+ ${XML2_LIBRARIES}
${EXPAT_LIB})
endif()
endif()