Commit d43f00bd authored by schultz's avatar schultz

made the assimp finder look for assimp 4.10 on our windows systems

parent f1d12623
......@@ -43,12 +43,16 @@ if( WIN32 )
SET(VS_SEARCH_PATH "${CMAKE_WINDOWS_LIBS_DIR}/vs2015/x64/")
elseif ( CMAKE_GENERATOR MATCHES "^Visual Studio 14.*" )
SET(VS_SEARCH_PATH "${CMAKE_WINDOWS_LIBS_DIR}/vs2015/x32/")
elseif ( CMAKE_GENERATOR MATCHES "^Visual Studio 15.*Win64" )
SET(VS_SEARCH_PATH "${CMAKE_WINDOWS_LIBS_DIR}/vs2017/x64/")
elseif ( CMAKE_GENERATOR MATCHES "^Visual Studio 15.*" )
SET(VS_SEARCH_PATH "${CMAKE_WINDOWS_LIBS_DIR}/vs2017/x32/")
endif()
# Find the headers
FIND_PATH( ASSIMP_INCLUDE_DIR assimp/scene.h
PATHS /usr/include
"${VS_SEARCH_PATH}assimp/include"
"${VS_SEARCH_PATH}assimp-4.1.0/include"
"C:/Program Files/Assimp/include" )
......@@ -56,8 +60,8 @@ if( WIN32 )
FIND_LIBRARY( ASSIMP_LIBRARY
NAMES assimp
PATH_SUFFIXES ${DIRSUFFIX}
PATHS "${CMAKE_WINDOWS_LIBS_DIR}/assimp/lib"
"${VS_SEARCH_PATH}assimp/lib"
PATHS "${CMAKE_WINDOWS_LIBS_DIR}/assimp-4.1.0/lib"
"${VS_SEARCH_PATH}assimp-4.1.0/lib"
"C:/Program Files/Assimp/lib"
)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment