v4games
/
assimp
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- Bugfix : Fix invalid variable ASSIMP_LIBRARY_DIRS. 

- Update : Introduce a subversion-revision variable for the right patch version.

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1260 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
pull/5/merge
kimmi 2012-06-18 19:33:17 +00:00
parent 141104f3f5
commit eb3fd360f4
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
CMakeLists.txt
View File

@ -2,9 +2,10 @@ cmake_minimum_required( VERSION 2.6 )
PROJECT( Assimp ) PROJECT( Assimp )
# Define here the needed parameters # Define here the needed parameters
set (ASSIMP_SV_REVISION 1260)
set (ASSIMP_VERSION_MAJOR 2) set (ASSIMP_VERSION_MAJOR 2)
set (ASSIMP_VERSION_MINOR 0) set (ASSIMP_VERSION_MINOR 0)
set (ASSIMP_VERSION_PATCH 1251) # subversion revision? set (ASSIMP_VERSION_PATCH ${ASSIMP_SV_REVISION}) # subversion revision?
set (ASSIMP_VERSION ${ASSIMP_VERSION_MAJOR}.${ASSIMP_VERSION_MINOR}.${ASSIMP_VERSION_PATCH}) set (ASSIMP_VERSION ${ASSIMP_VERSION_MAJOR}.${ASSIMP_VERSION_MINOR}.${ASSIMP_VERSION_PATCH})
set (ASSIMP_SOVERSION 1251) set (ASSIMP_SOVERSION 1251)
SET ( PROJECT_VERSION "${ASSIMP_VERSION}" ) SET ( PROJECT_VERSION "${ASSIMP_VERSION}" )
@ -13,7 +14,7 @@ set(PACKAGE_VERSION "0" CACHE STRING "the package-specific version used for uplo
option(OPT_BUILD_PACKAGES "Set to ON to generate CPack configuration files and packaging targets" OFF) option(OPT_BUILD_PACKAGES "Set to ON to generate CPack configuration files and packaging targets" OFF)
set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake-modules") set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake-modules")
set(LIBASSIMP_COMPONENT libassimp${ASSIMP_VERSION_MAJOR}.${ASSIMP_VERSION_MAJOR}-r1256) set(LIBASSIMP_COMPONENT libassimp${ASSIMP_VERSION_MAJOR}.${ASSIMP_VERSION_MAJOR}-r${ASSIMP_SV_REVISION})
set(CPACK_COMPONENTS_ALL assimp-bin ${LIBASSIMP_COMPONENT} assimp-dev) set(CPACK_COMPONENTS_ALL assimp-bin ${LIBASSIMP_COMPONENT} assimp-dev)
if(CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX) if(CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX)

2
assimp-config.cmake.in
View File

@ -37,7 +37,7 @@ if( WIN32 )
set( ASSIMP_CXX_FLAGS " -DBOOST_ALL_DYN_LINK -DBOOST_ALL_NO_LIB") set( ASSIMP_CXX_FLAGS " -DBOOST_ALL_DYN_LINK -DBOOST_ALL_NO_LIB")
endif() endif()
set( ASSIMP_LINK_FLAGS "" ) set( ASSIMP_LINK_FLAGS "" )
set( ASSIMP_LIBRARY_DIRS "${ASSIMP_ROOT_DIR}/lib@LIB_INSTALL_DIR@") set( ASSIMP_LIBRARY_DIRS "${ASSIMP_ROOT_DIR}/@LIB_INSTALL_DIR@")
set( ASSIMP_INCLUDE_DIRS "${ASSIMP_ROOT_DIR}/@INCLUDE_INSTALL_DIR@") set( ASSIMP_INCLUDE_DIRS "${ASSIMP_ROOT_DIR}/@INCLUDE_INSTALL_DIR@")
set( ASSIMP_LIBRARIES assimp) set( ASSIMP_LIBRARIES assimp)