fix for error linking opencollada on linux.

diff --git a/CMakeLists.txt b/CMakeLists.txt
index ea89cbddb9f9c8a64a34aa639255d3ccf659b401..6eb8b8c0853b4e34a77abd6a1503224f551041ee 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -702,7 +702,7 @@ elseif(WIN32)
                                ${LIBDIR}/opencollada/lib/ftoa.lib
                                ${LIBDIR}/opencollada/lib/UTF.lib
                        )
                                ${LIBDIR}/opencollada/lib/ftoa.lib
                                ${LIBDIR}/opencollada/lib/UTF.lib
                        )

-                       set(PCRE_LIB
+                       set(PCRE_LIBRARIES

                                ${LIBDIR}/opencollada/lib/pcre.lib
                        )
                endif()
                                ${LIBDIR}/opencollada/lib/pcre.lib
                        )
                endif()


@@ -844,7 +844,7 @@ elseif(WIN32)
                        )
                        set(OPENCOLLADA_LIBPATH ${OPENCOLLADA}/lib ${OPENCOLLADA}/lib)
                        set(OPENCOLLADA_LIBRARIES OpenCOLLADAStreamWriter OpenCOLLADASaxFrameworkLoader OpenCOLLADAFramework OpenCOLLADABaseUtils GeneratedSaxParser UTF MathMLSolver expat pcre buffer ftoa)
                        )
                        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)
                endif()
                
                if(WITH_CODEC_FFMPEG)


@@ -1066,7 +1066,7 @@ elseif(APPLE)
                #pcre is bundled with openCollada
                #set(PCRE ${LIBDIR}/pcre)
                #set(PCRE_LIBPATH ${PCRE}/lib)
                #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)
                #libxml2 is used
                #set(EXPAT ${LIBDIR}/expat)
                #set(EXPAT_LIBPATH ${EXPAT}/lib)

diff --git a/build_files/cmake/macros.cmake b/build_files/cmake/macros.cmake
index d09215d040df8a528c1e6fd11fa78a4df888487f..aec7a9fd96c960dc4dfa0f1ee86406053ca1bcce 100644 (file)
--- 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)
 
                        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")
 
                        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}
                else()
                        target_link_libraries(${target}
                                        ${OPENCOLLADA_LIBRARIES}

-                                       ${PCRE_LIB}
+                                       ${PCRE_LIBRARIES}
+                                       ${XML2_LIBRARIES}

                                        ${EXPAT_LIB})
                endif()
        endif()
                                        ${EXPAT_LIB})
                endif()
        endif()