mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-11-27 12:28:59 +08:00
0b4db02b9b
* [assimp] Fix cmake cofig name and add cmake version * [ogre] Update 'Assimp' to 'assimp
37 lines
1.6 KiB
Diff
37 lines
1.6 KiB
Diff
diff --git a/CMake/Dependencies.cmake b/CMake/Dependencies.cmake
|
|
index 2ae0b66..e6c55cd 100644
|
|
--- a/CMake/Dependencies.cmake
|
|
+++ b/CMake/Dependencies.cmake
|
|
@@ -242,7 +242,7 @@ find_package(FreeImage)
|
|
macro_log_feature(FreeImage_FOUND "freeimage" "Support for commonly used graphics image formats" "http://freeimage.sourceforge.net" FALSE "" "")
|
|
|
|
# Find FreeType
|
|
-find_package(Freetype)
|
|
+find_package(freetype CONFIG REQUIRED)
|
|
macro_log_feature(FREETYPE_FOUND "freetype" "Portable font engine" "http://www.freetype.org" FALSE "" "")
|
|
|
|
# Find X11
|
|
@@ -310,11 +310,11 @@ find_package(SWIG 3.0.8 QUIET)
|
|
macro_log_feature(SWIG_FOUND "SWIG" "Language bindings (Python, Java, C#) for OGRE" "http://www.swig.org/" FALSE "" "")
|
|
|
|
# pugixml
|
|
-find_package(pugixml QUIET)
|
|
+find_package(pugixml CONFIG REQUIRED)
|
|
macro_log_feature(pugixml_FOUND "pugixml" "Needed for XMLConverter and DotScene Plugin" "https://pugixml.org/" FALSE "" "")
|
|
|
|
# Assimp
|
|
-find_package(ASSIMP QUIET)
|
|
+find_package(assimp CONFIG REQUIRED)
|
|
macro_log_feature(ASSIMP_FOUND "Assimp" "Needed for the AssimpLoader Plugin" "https://www.assimp.org/" FALSE "" "")
|
|
|
|
if(ASSIMP_FOUND)
|
|
@@ -336,7 +336,7 @@ endif()
|
|
# Find sdl2
|
|
if(NOT ANDROID AND NOT EMSCRIPTEN)
|
|
# find script does not work in cross compilation environment
|
|
- find_package(SDL2 QUIET)
|
|
+ find_package(SDL2 CONFIG REQUIRED)
|
|
macro_log_feature(SDL2_FOUND "SDL2" "Simple DirectMedia Library needed for input handling in samples" "https://www.libsdl.org/" FALSE "" "")
|
|
if(SDL2_FOUND AND NOT TARGET SDL2::SDL2)
|
|
add_library(SDL2::SDL2 INTERFACE IMPORTED)
|