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

Fix MSVC linking for assimp and fcl #1510

Merged
merged 7 commits into from
Oct 17, 2020
Merged

Fix MSVC linking for assimp and fcl #1510

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
6104682
Fix MSVC linking for fcl
traversaro Oct 13, 2020
0fcac8f
Fix MSVC linking for fcl
traversaro Oct 13, 2020
915ca13
Fix MSVC linking for assimp
traversaro Oct 13, 2020
76cc303
Merge branch 'master' into patch-2
jslee02 Oct 14, 2020
71ee911
Merge branch 'master' into patch-2
jslee02 Oct 16, 2020
3899988
Update vcpkg tag for Windows MSVC build
traversaro Oct 16, 2020
98563d2
Merge branch 'master' into patch-2
jslee02 Oct 16, 2020
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
9 changes: 7 additions & 2 deletions cmake/Findassimp.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,15 +26,20 @@ find_path(ASSIMP_INCLUDE_DIRS assimp/scene.h

# Libraries
if(MSVC)
set(ASSIMP_LIBRARIES "assimp$<$<CONFIG:Debug>:d>")
find_package(assimp QUIET CONFIG)
if(TARGET assimp::assimp)
set(ASSIMP_LIBRARIES "assimp::assimp")
endif()
else()
find_library(ASSIMP_LIBRARIES
NAMES assimp
HINTS ${PC_ASSIMP_LIBDIR})
endif()

# Version
set(ASSIMP_VERSION ${PC_ASSIMP_VERSION})
if(PC_ASSIMP_VERSION)
set(ASSIMP_VERSION ${PC_ASSIMP_VERSION})
endif()

# Set (NAME)_FOUND if all the variables and the version are satisfied.
include(FindPackageHandleStandardArgs)
Expand Down
9 changes: 7 additions & 2 deletions cmake/Findfcl.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,10 @@ find_path(FCL_INCLUDE_DIRS

# Libraries
if(MSVC)
set(FCL_LIBRARIES "fcl$<$<CONFIG:Debug>:d>")
find_package(fcl QUIET CONFIG)
if(TARGET fcl)
set(FCL_LIBRARIES fcl)
endif()
else()
# Give explicit precedence to ${PC_FCL_LIBDIR}
find_library(FCL_LIBRARIES
Expand All @@ -44,7 +47,9 @@ else()
endif()

# Version
set(FCL_VERSION ${PC_FCL_VERSION})
if(PC_FCL_VERSION)
set(FCL_VERSION ${PC_FCL_VERSION})
endif()

# Set (NAME)_FOUND if all the variables and the version are satisfied.
include(FindPackageHandleStandardArgs)
Expand Down