diff options
| author | Arystanbek Dyussenov <arystan.d@gmail.com> | 2009-11-29 22:16:52 +0300 |
|---|---|---|
| committer | Arystanbek Dyussenov <arystan.d@gmail.com> | 2009-11-29 22:16:52 +0300 |
| commit | 92b4316708bad0448f4c433ef9c6c2d3cc1f4fb5 (patch) | |
| tree | 5b00bbd7dd2f8d08affce8ad7d5688f5b786cde4 /CMakeLists.txt | |
| parent | edf32a6fb0213bf35748890dfbc84b20d384298e (diff) | |
Merge from COLLADA branch into trunk of -c 24572 (cmake and scons for OpenCollada @ 675, Linux) and 25001 (bone animation import). See corresponding log entries for more detail.
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 100d6065c77..602fec4b759 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -216,8 +216,8 @@ IF(UNIX AND NOT APPLE) IF (WITH_OPENCOLLADA) SET(OPENCOLLADA /usr/local/opencollada CACHE FILEPATH "OpenCollada Directory") - SET(OPENCOLLADA_LIBPATH ${OPENCOLLADA}) - SET(OPENCOLLADA_LIB OpenCollada) + SET(OPENCOLLADA_LIBPATH ${OPENCOLLADA}/lib) + SET(OPENCOLLADA_LIB OpenCOLLADAStreamWriter OpenCOLLADASaxFrameworkLoader OpenCOLLADAFramework OpenCOLLADABaseUtils GeneratedSaxParser UTF MathMLSolver pcre ftoa Buffer) SET(OPENCOLLADA_INC ${OPENCOLLADA}) SET(PCRE /usr CACHE FILEPATH "PCRE Directory") SET(PCRE_LIBPATH ${PCRE}/lib) |