diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2011-08-24 22:13:11 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2011-08-24 22:13:11 +0400 |
| commit | 18d66643f4c9199939d0f90f7fd13e1b7472f661 (patch) | |
| tree | 55a10699eece8f3cfbb91499594b1a0c503a48b3 /build_files | |
| parent | 242035fa2df9dac3ec3cb97e17b5303aa4663833 (diff) | |
this should finally fix collada & ubuntu building with cmake
Diffstat (limited to 'build_files')
| -rw-r--r-- | build_files/cmake/Modules/FindOpenCOLLADA.cmake | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/build_files/cmake/Modules/FindOpenCOLLADA.cmake b/build_files/cmake/Modules/FindOpenCOLLADA.cmake index ca43a5a93a1..c7637283514 100644 --- a/build_files/cmake/Modules/FindOpenCOLLADA.cmake +++ b/build_files/cmake/Modules/FindOpenCOLLADA.cmake @@ -74,7 +74,10 @@ FOREACH(COMPONENT ${_opencollada_FIND_INCLUDES}) 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 @@ FOREACH(COMPONENT ${_opencollada_FIND_COMPONENTS}) ${_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 |