|
|
c07ea6c |
From 584a0923a3c78304974eb05930fbb908edbc8c8c Mon Sep 17 00:00:00 2001
|
|
|
c07ea6c |
From: Helio Chissini de Castro <helio@kde.org>
|
|
|
c07ea6c |
Date: Tue, 18 Apr 2017 19:21:30 +0200
|
|
|
c07ea6c |
Subject: [PATCH] Assimp cmake provider fix
|
|
|
c07ea6c |
|
|
|
c07ea6c |
---
|
|
|
c07ea6c |
assimp-config.cmake.in | 9 +++------
|
|
|
c07ea6c |
1 file changed, 3 insertions(+), 6 deletions(-)
|
|
|
c07ea6c |
|
|
|
c07ea6c |
diff --git a/assimp-config.cmake.in b/assimp-config.cmake.in
|
|
|
c07ea6c |
index e06cc10..9224b9b 100644
|
|
|
c07ea6c |
--- a/assimp-config.cmake.in
|
|
|
c07ea6c |
+++ b/assimp-config.cmake.in
|
|
|
f5767bf |
@@ -10,10 +10,7 @@
|
|
|
f5767bf |
# ASSIMP_LIBRARY_DIRS - link directories
|
|
|
f5767bf |
# ASSIMP_LIBRARIES - libraries to link plugins with
|
|
|
f5767bf |
# ASSIMP_Boost_VERSION - the boost version assimp was compiled with
|
|
|
f5767bf |
-get_filename_component(_PREFIX "${CMAKE_CURRENT_LIST_FILE}" PATH)
|
|
|
f5767bf |
-get_filename_component(_PREFIX "${_PREFIX}" PATH)
|
|
|
f5767bf |
-get_filename_component(_PREFIX "${_PREFIX}" PATH)
|
|
|
f5767bf |
-get_filename_component(ASSIMP_ROOT_DIR "${_PREFIX}" PATH)
|
|
|
f5767bf |
+set(ASSIMP_ROOT_DIR "@CMAKE_INSTALL_PREFIX@")
|
|
|
f5767bf |
|
|
|
f5767bf |
if( MSVC )
|
|
|
f5767bf |
# in order to prevent DLL hell, each of the DLLs have to be suffixed with the major version and msvc prefix
|
|
|
c07ea6c |
@@ -45,8 +42,8 @@ if( WIN32 )
|
|
|
f5767bf |
set( ASSIMP_CXX_FLAGS " -DBOOST_ALL_DYN_LINK -DBOOST_ALL_NO_LIB")
|
|
|
f5767bf |
endif()
|
|
|
f5767bf |
set( ASSIMP_LINK_FLAGS "" )
|
|
|
f5767bf |
-set( ASSIMP_LIBRARY_DIRS "${ASSIMP_ROOT_DIR}/@ASSIMP_LIB_INSTALL_DIR@")
|
|
|
f5767bf |
-set( ASSIMP_INCLUDE_DIRS "${ASSIMP_ROOT_DIR}/@ASSIMP_INCLUDE_INSTALL_DIR@")
|
|
|
f5767bf |
+set( ASSIMP_LIBRARY_DIRS "@ASSIMP_LIB_INSTALL_DIR@")
|
|
|
f5767bf |
+set( ASSIMP_INCLUDE_DIRS "@ASSIMP_INCLUDE_INSTALL_DIR@")
|
|
|
f5767bf |
set( ASSIMP_LIBRARIES assimp${ASSIMP_LIBRARY_SUFFIX})
|
|
|
c07ea6c |
set( ASSIMP_LIBRARIES ${ASSIMP_LIBRARIES}@CMAKE_DEBUG_POSTFIX@)
|
|
|
c27ec6b |
|
|
|
c07ea6c |
--
|
|
|
c07ea6c |
2.9.3
|
|
|
c07ea6c |
|