Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Humanoid Path Planner
hpp-fcl
Commits
b5e447c9
Verified
Commit
b5e447c9
authored
Aug 07, 2020
by
Justin Carpentier
Browse files
cmake: fix check
parent
b377becd
Changes
1
Hide whitespace changes
Inline
Side-by-side
cmake-modules/Findassimp.cmake
View file @
b5e447c9
...
...
@@ -28,17 +28,28 @@ if(WIN32)
find_path
(
ASSIMP_LIBRARY_DIR
NAMES
assimp-
${
ASSIMP_MSVC_VERSION
}
-mt.lib
assimp-
${
ASSIMP_MSVC_VERSION
}
-mtd.lib
HINTS
${
ASSIMP_ROOT_DIR
}
/lib
${
ASSIMP_ARCHITECTURE
}
)
find_library
(
ASSIMP_LIBRARY_RELEASE assimp-
${
ASSIMP_MSVC_VERSION
}
-mt.lib PATHS
${
ASSIMP_LIBRARY_DIR
}
)
find_library
(
ASSIMP_LIBRARY_DEBUG assimp-
${
ASSIMP_MSVC_VERSION
}
-mtd.lib PATHS
${
ASSIMP_LIBRARY_DIR
}
)
IF
(
NOT ASSIMP_LIBRARY_RELEASE AND NOT ASSIMP_LIBRARY_DEBUG
)
continue
()
ENDIF
()
set
(
ASSIMP_LIBRARY
optimized
${
ASSIMP_LIBRARY_RELEASE
}
debug
${
ASSIMP_LIBRARY_DEBUG
}
)
IF
(
ASSIMP_LIBRARY_DEBUG
)
set
(
ASSIMP_LIBRARY
optimized
${
ASSIMP_LIBRARY_RELEASE
}
debug
${
ASSIMP_LIBRARY_DEBUG
}
)
ELSE
()
set
(
ASSIMP_LIBRARY
optimized
${
ASSIMP_LIBRARY_RELEASE
}
)
ENDIF
()
set
(
ASSIMP_LIBRARIES
${
ASSIMP_LIBRARY_RELEASE
}
${
ASSIMP_LIBRARY_DEBUG
}
)
...
...
@@ -50,7 +61,7 @@ if(WIN32)
VERBATIM
)
ENDFUNCTION
(
ASSIMP_COPY_BINARIES
)
SET
(
assimp_LIBRARIES
${
ASSIMP_LIBRARY
_RELEASE
}
)
SET
(
assimp_LIBRARIES
${
ASSIMP_LIBRARY
}
)
endforeach
()
endif
()
...
...
Write
Preview
Supports
Markdown
0%
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!
Cancel
Please
register
or
sign in
to comment