Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
iMSTK
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
iMSTK
iMSTK
Commits
d71168d0
Commit
d71168d0
authored
9 years ago
by
Ricardo Ortiz
Browse files
Options
Downloads
Patches
Plain Diff
Fix assimp zlib finder.
Closes #49
parent
520884a5
No related branches found
Branches containing commit
No related tags found
Tags containing commit
1 merge request
!52
Remove GLEW external project.
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
CMake/FindAssimp.cmake
+5
-3
5 additions, 3 deletions
CMake/FindAssimp.cmake
with
5 additions
and
3 deletions
CMake/FindAssimp.cmake
+
5
−
3
View file @
d71168d0
...
...
@@ -27,17 +27,19 @@ find_library(ASSIMP_LIBRARY
assimp
${
LIBRARY_SUFFIX
}
d
)
find_package
(
ZLIB
)
set
(
ASSIMP_ZLIB_INCLUDE_DIR
)
find_package
(
ZLIB QUIET
)
if
(
NOT ZLIB_FOUND
)
find_library
(
ZLIB_LIBRARY
NAMES
zlibstaticd
zlibstatic
)
set
(
ASSIMP_ZLIB_INCLUDE_DIR
"
${
ASSIMP_INCLUDE_DIR
}
"
)
else
()
set
(
ASSIMP_ZLIB_INCLUDE_DIR
"
${
ZLIB_INCLUDE_DIR
}
"
)
endif
()
set
(
ASSIMP_ZLIB_INCLUDE_DIR
"
${
ASSIMP_INCLUDE_DIR
}
"
"
${
ZLIB_INCLUDE_DIR
}
"
)
set
(
ASSIMP_INCLUDE_DIRS
"
${
ASSIMP_INCLUDE_DIR
}
"
)
set
(
ASSIMP_LIBRARIES
"
${
ASSIMP_LIBRARY
}
"
"
${
ZLIB_LIBRARY
}
"
)
...
...
This diff is collapsed.
Click to expand it.
Ricardo Ortiz
@ricardo-ortiz
mentioned in commit
92a6dd4f
·
9 years ago
mentioned in commit
92a6dd4f
mentioned in commit 92a6dd4f79cb43d9de9a82a5e2bca9d8e82f0765
Toggle commit list
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment