forked from assimp/assimp
-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- CMake overhaul. Add proper FindXXX scripts for PkgMacros, ZLIB, Dir…
…ectX. Isolate MSVC-specific defines. Add newer boost versions to boost whitelist. Many thanks to Mr. S. for the patch! (see http://zfx.info/viewtopic.php?f=9&t=334&p=32190#p32190) git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1293 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
- Loading branch information
aramis_acg
committed
Jul 17, 2012
1 parent
1378579
commit aaf0be0
Showing
12 changed files
with
415 additions
and
152 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,11 +1,11 @@ | ||
| set(PACKAGE_VERSION "@ASSIMP_SOVERSION@") | ||
| set(ASSIMP_PACKAGE_VERSION "@ASSIMP_SOVERSION@") | ||
|
|
||
| # Check whether the requested PACKAGE_FIND_VERSION is compatible | ||
| if("${PACKAGE_VERSION}" VERSION_LESS "${PACKAGE_FIND_VERSION}") | ||
| set(PACKAGE_VERSION_COMPATIBLE FALSE) | ||
| if("${ASSIMP_PACKAGE_VERSION}" VERSION_LESS "${ASSIMP_PACKAGE_FIND_VERSION}") | ||
| set(ASSIMP_PACKAGE_VERSION_COMPATIBLE FALSE) | ||
| else() | ||
| set(PACKAGE_VERSION_COMPATIBLE TRUE) | ||
| if ("${PACKAGE_VERSION}" VERSION_EQUAL "${PACKAGE_FIND_VERSION}") | ||
| set(PACKAGE_VERSION_EXACT TRUE) | ||
| set(ASSIMP_PACKAGE_VERSION_COMPATIBLE TRUE) | ||
| if ("${ASSIMP_PACKAGE_VERSION}" VERSION_EQUAL "${ASSIMP_PACKAGE_FIND_VERSION}") | ||
| set(ASSIMP_PACKAGE_VERSION_EXACT TRUE) | ||
| endif() | ||
| endif() |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,12 +1,13 @@ | ||
| set( PACKAGE_VERSION "@ASSIMP_VERSION@" ) | ||
| if( "${PACKAGE_FIND_VERSION}" VERSION_EQUAL "@ASSIMP_VERSION@") | ||
| set(PACKAGE_VERSION_EXACT 1) | ||
| set( ASSIMP_PACKAGE_VERSION "@ASSIMP_VERSION@" ) | ||
| if( "${ASSIMP_PACKAGE_FIND_VERSION}" VERSION_EQUAL "@ASSIMP_VERSION@") | ||
| set(ASSIMP_PACKAGE_VERSION_EXACT 1) | ||
| endif() | ||
| if( "${PACKAGE_FIND_VERSION_MAJOR}.${PACKAGE_FIND_VERSION_MINOR}" EQUAL "@ASSIMP_SOVERSION@" ) | ||
| set(PACKAGE_VERSION_COMPATIBLE 1) | ||
| elseif( "${PACKAGE_FIND_VERSION_MAJOR}" EQUAL "@ASSIMP_VERSION_MAJOR@" ) | ||
| if( "${ASSIMP_PACKAGE_FIND_VERSION_MAJOR}.${ASSIMP_PACKAGE_FIND_VERSION_MINOR}" EQUAL "@ASSIMP_SOVERSION@" ) | ||
| set(ASSIMP_PACKAGE_VERSION_COMPATIBLE 1) | ||
| elseif( "${ASSIMP_PACKAGE_FIND_VERSION_MAJOR}" EQUAL "@ASSIMP_VERSION_MAJOR@" ) | ||
| # for now backward compatible if minor version is less | ||
| if( ${PACKAGE_FIND_VERSION_MINOR} LESS @ASSIMP_VERSION_MINOR@ ) | ||
| set(PACKAGE_VERSION_COMPATIBLE 1) | ||
| if( ${ASSIMP_PACKAGE_FIND_VERSION_MINOR} LESS @ASSIMP_VERSION_MINOR@ ) | ||
| set(ASSIMP_PACKAGE_VERSION_COMPATIBLE 1) | ||
| endif() | ||
| endif() | ||
| set( ASSIMP_STATIC_LIB "@ASSIMP_BUILD_STATIC_LIB@") |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,100 @@ | ||
| #------------------------------------------------------------------- | ||
| # This file is part of the CMake build system for OGRE | ||
| # (Object-oriented Graphics Rendering Engine) | ||
| # For the latest info, see http://www.ogre3d.org/ | ||
| # | ||
| # The contents of this file are placed in the public domain. Feel | ||
| # free to make use of it in any way you like. | ||
| #------------------------------------------------------------------- | ||
|
|
||
| # ----------------------------------------------------------------------------- | ||
| # Find DirectX SDK | ||
| # Define: | ||
| # DirectX_FOUND | ||
| # DirectX_INCLUDE_DIR | ||
| # DirectX_LIBRARY | ||
| # DirectX_ROOT_DIR | ||
|
|
||
| if(WIN32) # The only platform it makes sense to check for DirectX SDK | ||
| include(FindPkgMacros) | ||
| findpkg_begin(DirectX) | ||
|
|
||
| # Get path, convert backslashes as ${ENV_DXSDK_DIR} | ||
| getenv_path(DXSDK_DIR) | ||
| getenv_path(DIRECTX_HOME) | ||
| getenv_path(DIRECTX_ROOT) | ||
| getenv_path(DIRECTX_BASE) | ||
|
|
||
| # construct search paths | ||
| set(DirectX_PREFIX_PATH | ||
| "${DXSDK_DIR}" "${ENV_DXSDK_DIR}" | ||
| "${DIRECTX_HOME}" "${ENV_DIRECTX_HOME}" | ||
| "${DIRECTX_ROOT}" "${ENV_DIRECTX_ROOT}" | ||
| "${DIRECTX_BASE}" "${ENV_DIRECTX_BASE}" | ||
| "C:/apps_x86/Microsoft DirectX SDK*" | ||
| "C:/Program Files (x86)/Microsoft DirectX SDK*" | ||
| "C:/apps/Microsoft DirectX SDK*" | ||
| "C:/Program Files/Microsoft DirectX SDK*" | ||
| "$ENV{ProgramFiles}/Microsoft DirectX SDK*" | ||
| ) | ||
| create_search_paths(DirectX) | ||
| # redo search if prefix path changed | ||
| clear_if_changed(DirectX_PREFIX_PATH | ||
| DirectX_LIBRARY | ||
| DirectX_INCLUDE_DIR | ||
| ) | ||
|
|
||
| find_path(DirectX_INCLUDE_DIR NAMES d3d9.h HINTS ${DirectX_INC_SEARCH_PATH}) | ||
| # dlls are in DirectX_ROOT_DIR/Developer Runtime/x64|x86 | ||
| # lib files are in DirectX_ROOT_DIR/Lib/x64|x86 | ||
| if(CMAKE_CL_64) | ||
| set(DirectX_LIBPATH_SUFFIX "x64") | ||
| else(CMAKE_CL_64) | ||
| set(DirectX_LIBPATH_SUFFIX "x86") | ||
| endif(CMAKE_CL_64) | ||
| find_library(DirectX_LIBRARY NAMES d3d9 HINTS ${DirectX_LIB_SEARCH_PATH} PATH_SUFFIXES ${DirectX_LIBPATH_SUFFIX}) | ||
| find_library(DirectX_D3DX9_LIBRARY NAMES d3dx9 HINTS ${DirectX_LIB_SEARCH_PATH} PATH_SUFFIXES ${DirectX_LIBPATH_SUFFIX}) | ||
| find_library(DirectX_DXERR_LIBRARY NAMES DxErr HINTS ${DirectX_LIB_SEARCH_PATH} PATH_SUFFIXES ${DirectX_LIBPATH_SUFFIX}) | ||
| find_library(DirectX_DXGUID_LIBRARY NAMES dxguid HINTS ${DirectX_LIB_SEARCH_PATH} PATH_SUFFIXES ${DirectX_LIBPATH_SUFFIX}) | ||
|
|
||
|
|
||
| # look for dxgi (needed by both 10 and 11) | ||
| find_library(DirectX_DXGI_LIBRARY NAMES dxgi HINTS ${DirectX_LIB_SEARCH_PATH} PATH_SUFFIXES ${DirectX_LIBPATH_SUFFIX}) | ||
|
|
||
| # look for d3dcompiler (needed by 11) | ||
| find_library(DirectX_D3DCOMPILER_LIBRARY NAMES d3dcompiler HINTS ${DirectX_LIB_SEARCH_PATH} PATH_SUFFIXES ${DirectX_LIBPATH_SUFFIX}) | ||
|
|
||
| findpkg_finish(DirectX) | ||
| set(DirectX_LIBRARIES ${DirectX_LIBRARIES} | ||
| ${DirectX_D3DX9_LIBRARY} | ||
| ${DirectX_DXERR_LIBRARY} | ||
| ${DirectX_DXGUID_LIBRARY} | ||
| ) | ||
|
|
||
| mark_as_advanced(DirectX_D3DX9_LIBRARY DirectX_DXERR_LIBRARY DirectX_DXGUID_LIBRARY | ||
| DirectX_DXGI_LIBRARY DirectX_D3DCOMPILER_LIBRARY) | ||
|
|
||
|
|
||
| # look for D3D11 components | ||
| if (DirectX_FOUND) | ||
| find_path(DirectX_D3D11_INCLUDE_DIR NAMES D3D11Shader.h HINTS ${DirectX_INC_SEARCH_PATH}) | ||
| get_filename_component(DirectX_LIBRARY_DIR "${DirectX_LIBRARY}" PATH) | ||
| message(STATUS "DX lib dir: ${DirectX_LIBRARY_DIR}") | ||
| find_library(DirectX_D3D11_LIBRARY NAMES d3d11 HINTS ${DirectX_LIB_SEARCH_PATH} PATH_SUFFIXES ${DirectX_LIBPATH_SUFFIX}) | ||
| find_library(DirectX_D3DX11_LIBRARY NAMES d3dx11 HINTS ${DirectX_LIB_SEARCH_PATH} PATH_SUFFIXES ${DirectX_LIBPATH_SUFFIX}) | ||
| if (DirectX_D3D11_INCLUDE_DIR AND DirectX_D3D11_LIBRARY) | ||
| set(DirectX_D3D11_FOUND TRUE) | ||
| set(DirectX_D3D11_INCLUDE_DIR ${DirectX_D3D11_INCLUDE_DIR}) | ||
| set(DirectX_D3D11_LIBRARIES ${DirectX_D3D11_LIBRARIES} | ||
| ${DirectX_D3D11_LIBRARY} | ||
| ${DirectX_D3DX11_LIBRARY} | ||
| ${DirectX_DXGI_LIBRARY} | ||
| ${DirectX_DXERR_LIBRARY} | ||
| ${DirectX_DXGUID_LIBRARY} | ||
| ${DirectX_D3DCOMPILER_LIBRARY} | ||
| ) | ||
| endif () | ||
| mark_as_advanced(DirectX_D3D11_INCLUDE_DIR DirectX_D3D11_LIBRARY DirectX_D3DX11_LIBRARY) | ||
| endif () | ||
|
|
||
| endif(WIN32) |
Oops, something went wrong.