Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Support more ways to build with dependency to collada-dom library (Debian/Ubuntu/Others) #1171

Open
wants to merge 1 commit into
base: OpenSceneGraph-3.6
Choose a base branch
from
Open

Support more ways to build with dependency to collada-dom library (Debian/Ubuntu/Others) #1171

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions CMakeModules/FindCOLLADA.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@ FIND_PATH(COLLADA_INCLUDE_DIR dae.h
${COLLADA_DOM_ROOT}/include
$ENV{COLLADA_DIR}/include
$ENV{COLLADA_DIR}
$ENV{COLLADA_DIR}/include/collada-dom2.5
~/Library/Frameworks
/Library/Frameworks
/opt/local/Library/Frameworks #macports
Expand Down Expand Up @@ -185,8 +186,7 @@ FIND_LIBRARY(COLLADA_STATIC_LIBRARY_DEBUG
${ACTUAL_3DPARTY_DIR}/lib
)

# find extra libraries that the static linking requires

IF (COLLADA_STATIC_LIBRARY)
FIND_PACKAGE(LibXml2)
IF (LIBXML2_FOUND)
SET(COLLADA_LIBXML_LIBRARY "${LIBXML2_LIBRARIES}" CACHE FILEPATH "" FORCE)
Expand Down Expand Up @@ -309,7 +309,7 @@ FIND_LIBRARY(COLLADA_STATIC_LIBRARY_DEBUG
${COLLADA_DOM_ROOT}/external-libs/boost/lib/mingw
${ACTUAL_3DPARTY_DIR}/lib
)

ENDIF()

SET(COLLADA_FOUND "NO")
IF(COLLADA_DYNAMIC_LIBRARY OR COLLADA_STATIC_LIBRARY)
Expand Down