From eb3fd360f416535180ab9a468a3eb7c389ae9d60 Mon Sep 17 00:00:00 2001 From: kimmi Date: Mon, 18 Jun 2012 19:33:17 +0000 Subject: [PATCH] - 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 --- CMakeLists.txt | 5 +++-- assimp-config.cmake.in | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index f5036667b..2aecdbb72 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,9 +2,10 @@ cmake_minimum_required( VERSION 2.6 ) PROJECT( Assimp ) # Define here the needed parameters +set (ASSIMP_SV_REVISION 1260) set (ASSIMP_VERSION_MAJOR 2) 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_SOVERSION 1251) 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) 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) if(CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX) diff --git a/assimp-config.cmake.in b/assimp-config.cmake.in index 936a7f2ba..853cc06fd 100644 --- a/assimp-config.cmake.in +++ b/assimp-config.cmake.in @@ -37,7 +37,7 @@ if( WIN32 ) set( ASSIMP_CXX_FLAGS " -DBOOST_ALL_DYN_LINK -DBOOST_ALL_NO_LIB") endif() 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_LIBRARIES assimp)