Skip to content

check PkgConfig first, then use assimp.cmake, to avoid compile warnin… #46

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

Closed
k-okada wants to merge 1 commit into from
+4 −4
Closed

check PkgConfig first, then use assimp.cmake, to avoid compile warnin… #46

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
8 changes: 4 additions & 4 deletions collada_urdf/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,12 @@ endif()

include_directories(include)

find_package(assimp QUIET)
find_package(PkgConfig REQUIRED)
pkg_check_modules(ASSIMP assimp)
if ( NOT ASSIMP_FOUND )
find_package(Assimp QUIET)
find_package(assimp QUIET)
if ( NOT ASSIMP_FOUND )
find_package(PkgConfig REQUIRED)
pkg_check_modules(ASSIMP assimp)
find_package(Assimp QUIET)
endif()
endif()
if( ASSIMP_FOUND )
Expand Down