Merge branch 'master' into findDegeneratesOptimization

This commit is contained in:
Kim Kulling
2020-11-14 12:32:57 +01:00
committed by GitHub
2 changed files with 12 additions and 5 deletions

View File

@@ -232,6 +232,8 @@ SET_PROPERTY( TARGET assimp PROPERTY DEBUG_POSTFIX ${CMAKE_DEBUG_POSTFIX} )
IF( WIN32 )
SET( platform_libs )
ELSEIF(ANDROID)
SET( platform_libs )
ELSE()
SET( platform_libs pthread )
ENDIF()