Revision: 39679
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=39679
Author: campbellbarton
Date: 2011-08-24 18:13:11 +0000 (Wed, 24 Aug 2011)
Log Message:
-----------
this should finally fix collada & ubuntu building with cmake
Modified Paths:
--------------
trunk/blender/build_files/cmake/Modules/FindOpenCOLLADA.cmake
Modified: trunk/blender/build_files/cmake/Modules/FindOpenCOLLADA.cmake
===================================================================
--- trunk/blender/build_files/cmake/Modules/FindOpenCOLLADA.cmake
2011-08-24 17:42:43 UTC (rev 39678)
+++ trunk/blender/build_files/cmake/Modules/FindOpenCOLLADA.cmake
2011-08-24 18:13:11 UTC (rev 39679)
@@ -74,7 +74,10 @@
NAMES
${COMPONENT}/include
${COMPONENT}
- include/opencollada/${COMPONENT} # ubuntu ppa needs this
+ # Ubuntu ppa needs this.
+ # Alternative would be to suffix all members of search path
+ # but this is less trouble, just looks strange.
+ include/opencollada/${COMPONENT}
HINTS
${_opencollada_SEARCH_DIRS}
)
@@ -94,22 +97,15 @@
${_opencollada_SEARCH_DIRS}
PATH_SUFFIXES
lib64 lib
+ # Ubuntu ppa needs this.
+ lib64/opencollada lib/opencollada
)
MARK_AS_ADVANCED(OPENCOLLADA_${UPPERCOMPONENT}_LIBRARY)
LIST(APPEND _opencollada_LIBRARIES
"${OPENCOLLADA_${UPPERCOMPONENT}_LIBRARY}")
ENDFOREACH()
-FIND_LIBRARY(OPENCOLLADA_LIBRARY
- NAMES
- jack
- HINTS
- ${_opencollada_SEARCH_DIRS}
- PATH_SUFFIXES
- lib64 lib
- )
-
-# handle the QUIETLY and REQUIRED arguments and set OPENEXR_FOUND to TRUE if
+# handle the QUIETLY and REQUIRED arguments and set OPENCOLLADA_FOUND to TRUE
if
# all listed variables are TRUE
INCLUDE(FindPackageHandleStandardArgs)
FIND_PACKAGE_HANDLE_STANDARD_ARGS(OpenCOLLADA DEFAULT_MSG
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
