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.

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

Fix FindAssimp on Windows #371

Merged
merged 2 commits into from
Feb 23, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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: 6 additions & 0 deletions find-modules/Findassimp.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,12 @@ This module defines the following variables:

#]=======================================================================]

find_package(assimp NO_MODULE QUIET)
if(assimp_FOUND)
find_package_handle_standard_args(assimp CONFIG_MODE)
return()
endif()

set(ASSIMP_SHARED_LIBRARY_NAME)
set(ASSIMP_SHARED_LIBRARY_NAME_DEBUG)

Expand Down
6 changes: 6 additions & 0 deletions help/release/0.12.2.rst
Original file line number Diff line number Diff line change
Expand Up @@ -22,3 +22,9 @@ Superbuild Modules
* Fixed a bug in :module:`YCMEPHelper` that prevented from opening the CMake
cache editor when the corresponding target was used in development mode, e.g.
``<project_name>-edit_cache``.

Find Modules
------------

* The :module:`Findassimp` learned to first check if
an assimp CMake config is present in the system.