Fix issue with finding the right libjpeg-turbo on mac
This commit is contained in:
4
3rdParty/assimp/CMakeLists.txt
vendored
4
3rdParty/assimp/CMakeLists.txt
vendored
@@ -26,7 +26,7 @@ elseif (USE_ASSIMP)
|
|||||||
|
|
||||||
FetchContent_MakeAvailable(assimp)
|
FetchContent_MakeAvailable(assimp)
|
||||||
|
|
||||||
set(assimp_BUILT "fetched assimp found" CACHE INTERNAL ON)
|
set(assimp_BUILT ON CACHE INTERNAL "fetched assimp found")
|
||||||
endif ()
|
endif ()
|
||||||
|
|
||||||
|
|
||||||
@@ -37,4 +37,4 @@ function(LinkAssimp TARGET)
|
|||||||
if (assimp_FOUND OR assimp_BUILT)
|
if (assimp_FOUND OR assimp_BUILT)
|
||||||
target_link_libraries(${TARGET} PUBLIC assimp)
|
target_link_libraries(${TARGET} PUBLIC assimp)
|
||||||
endif ()
|
endif ()
|
||||||
endfunction()
|
endfunction()
|
||||||
|
|||||||
4
3rdParty/libjpeg-turbo/CMakeLists.txt
vendored
4
3rdParty/libjpeg-turbo/CMakeLists.txt
vendored
@@ -1,6 +1,8 @@
|
|||||||
include(../../cmake/Utils.cmake)
|
include(../../cmake/Utils.cmake)
|
||||||
|
|
||||||
Find_Package(libjpeg-turbo QUIET)
|
if (NOT IOS)
|
||||||
|
Find_Package(libjpeg-turbo QUIET)
|
||||||
|
endif()
|
||||||
if (libjpeg-turbo_FOUND)
|
if (libjpeg-turbo_FOUND)
|
||||||
message("Using system libjpeg-turbo")
|
message("Using system libjpeg-turbo")
|
||||||
else ()
|
else ()
|
||||||
|
|||||||
Reference in New Issue
Block a user