diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2011-09-02 16:33:29 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2011-09-02 16:33:29 +0400 |
| commit | b56ffd2cdb51021d1a3456af9e8f4b5451407c61 (patch) | |
| tree | f51e4af01e685d779ff498b69496f9ff3a0eada1 /CMakeLists.txt | |
| parent | fefbdc4376b6bacdaba0ad50da3c706289301b3d (diff) | |
| parent | 15afd240e04ef3f220b6133cc920d964dbcfcf85 (diff) | |
Cycles: svn merge -r39669:39870 https://svn.blender.org/svnroot/bf-blender/trunk/blender
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 57 |
1 files changed, 38 insertions, 19 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index d1b4a9a7590..a09d208c9ab 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -474,21 +474,20 @@ if(UNIX AND NOT APPLE) endif() if(WITH_OPENCOLLADA) - set(OPENCOLLADA /usr/local/opencollada CACHE PATH "OpenCollada Directory") - mark_as_advanced(OPENCOLLADA) - set(OPENCOLLADA_LIBPATH ${OPENCOLLADA}/lib) - set(OPENCOLLADA_LIBRARIES OpenCOLLADAStreamWriter OpenCOLLADASaxFrameworkLoader OpenCOLLADAFramework OpenCOLLADABaseUtils GeneratedSaxParser UTF MathMLSolver pcre ftoa buffer xml2) - set(OPENCOLLADA_INCLUDE_DIR ${OPENCOLLADA}) - - set(PCRE /usr CACHE PATH "PCRE Directory") - mark_as_advanced(PCRE) - set(PCRE_LIBPATH ${PCRE}/lib) - set(PCRE_LIB pcre) + find_package(OpenCOLLADA) + if(OPENCOLLADA_FOUND) + set(PCRE /usr CACHE PATH "PCRE Directory") + mark_as_advanced(PCRE) + set(PCRE_LIBPATH ${PCRE}/lib) + set(PCRE_LIB pcre) - set(EXPAT /usr CACHE PATH "Expat Directory") - mark_as_advanced(EXPAT) - set(EXPAT_LIBPATH ${EXPAT}/lib) - set(EXPAT_LIB expat) + set(EXPAT /usr CACHE PATH "Expat Directory") + mark_as_advanced(EXPAT) + set(EXPAT_LIBPATH ${EXPAT}/lib) + set(EXPAT_LIB expat) + else() + set(WITH_OPENCOLLADA OFF) + endif() endif() if(WITH_MEM_JEMALLOC) @@ -747,9 +746,15 @@ elseif(WIN32) endif() if(WITH_OPENCOLLADA) - set(OPENCOLLADA_INCLUDE_DIR - ${LIBDIR}/opencollada/include + + set(OPENCOLLADA_INCLUDE_DIRS + ${LIBDIR}/opencollada/include/COLLADAStreamWriter/include + ${LIBDIR}/opencollada/include/COLLADABaseUtils/include + ${LIBDIR}/opencollada/include/COLLADAFramework/include + ${LIBDIR}/opencollada/include/COLLADASaxFrameworkLoader/include + ${LIBDIR}/opencollada/include/GeneratedSaxParser/include ) + set(OPENCOLLADA_LIBRARIES ${LIBDIR}/opencollada/lib/OpenCOLLADASaxFrameworkLoader.lib ${LIBDIR}/opencollada/lib/OpenCOLLADAFramework.lib @@ -917,7 +922,13 @@ elseif(WIN32) if(WITH_OPENCOLLADA) set(OPENCOLLADA ${LIBDIR}/gcc/opencollada) - set(OPENCOLLADA_INCLUDE_DIR ${OPENCOLLADA}/include) + set(OPENCOLLADA_INCLUDE_DIRS + ${LIBDIR}/gcc/opencollada/include/COLLADAStreamWriter/include + ${LIBDIR}/gcc/opencollada/include/COLLADABaseUtils/include + ${LIBDIR}/gcc/opencollada/include/COLLADAFramework/include + ${LIBDIR}/gcc/opencollada/include/COLLADASaxFrameworkLoader/include + ${LIBDIR}/gcc/opencollada/include/GeneratedSaxParser/include + ) 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) @@ -1017,7 +1028,7 @@ elseif(APPLE) # we use precompiled libraries for py 3.2 and up by default # normally cached but not since we include them with blender - set(PYTHON_VERSION 3.2) + set(PYTHON_VERSION 3.2) set(PYTHON_INCLUDE_DIR "${LIBDIR}/python/include/python${PYTHON_VERSION}") # set(PYTHON_BINARY "${LIBDIR}/python/bin/python${PYTHON_VERSION}") # not used yet set(PYTHON_LIBRARY python${PYTHON_VERSION}) @@ -1128,7 +1139,15 @@ elseif(APPLE) if(WITH_OPENCOLLADA) set(OPENCOLLADA ${LIBDIR}/opencollada) - set(OPENCOLLADA_INCLUDE_DIR ${OPENCOLLADA}/include) + + set(OPENCOLLADA_INCLUDE_DIRS + ${LIBDIR}/opencollada/include/COLLADAStreamWriter + ${LIBDIR}/opencollada/include/COLLADABaseUtils + ${LIBDIR}/opencollada/include/COLLADAFramework + ${LIBDIR}/opencollada/include/COLLADASaxFrameworkLoader + ${LIBDIR}/opencollada/include/GeneratedSaxParser + ) + set(OPENCOLLADA_LIBPATH ${OPENCOLLADA}/lib) set(OPENCOLLADA_LIBRARIES "OpenCOLLADASaxFrameworkLoader -lOpenCOLLADAFramework -lOpenCOLLADABaseUtils -lOpenCOLLADAStreamWriter -lMathMLSolver -lGeneratedSaxParser -lUTF -lxml2 -lbuffer -lftoa" ) #pcre is bundled with openCollada |