[assimp] Fix assimp overwriting CMAKE_PREFIX_PATH.

This commit is contained in:
Robert Schumacher 2017-11-01 01:54:16 -07:00
parent 7435624eec
commit 0a4b09d9c5
3 changed files with 23 additions and 10 deletions

View File

@ -1,4 +1,4 @@
Source: assimp
Version: 4.0.1-1
Version: 4.0.1-2
Description: The Open Asset import library
Build-Depends: zlib

View File

@ -0,0 +1,12 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index d781d1f..0d64d50 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -92,7 +92,6 @@ if (WIN32)
endif()
IF(MSVC)
- set (CMAKE_PREFIX_PATH "D:\\libs\\devil")
OPTION( ASSIMP_INSTALL_PDB
"Install MSVC debug files."
ON

View File

@ -10,17 +10,20 @@ vcpkg_from_github(
vcpkg_apply_patches(
SOURCE_PATH ${SOURCE_PATH}
PATCHES ${CMAKE_CURRENT_LIST_DIR}/const-compare-worditerator.patch
PATCHES
"${CMAKE_CURRENT_LIST_DIR}/const-compare-worditerator.patch"
"${CMAKE_CURRENT_LIST_DIR}/dont-overwrite-prefix-path.patch"
)
file(REMOVE ${SOURCE_PATH}/cmake-modules/FindZLIB.cmake)
vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
OPTIONS -DASSIMP_BUILD_TESTS=False
-DASSIMP_BUILD_ASSIMP_VIEW=False
-DASSIMP_BUILD_ZLIB=False
-DASSIMP_BUILD_ASSIMP_TOOLS=False
-DASSIMP_INSTALL_PDB=False
-DZLIB_HOME=${CURRENT_INSTALLED_DIR}
OPTIONS -DASSIMP_BUILD_TESTS=OFF
-DASSIMP_BUILD_ASSIMP_VIEW=OFF
-DASSIMP_BUILD_ZLIB=OFF
-DASSIMP_BUILD_ASSIMP_TOOLS=OFF
-DASSIMP_INSTALL_PDB=OFF
)
vcpkg_install_cmake()
@ -30,8 +33,6 @@ vcpkg_fixup_cmake_targets(CONFIG_PATH "lib/cmake/assimp-4.0")
vcpkg_copy_pdbs()
file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/share)
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib/cmake)
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/lib/cmake)
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
file(READ ${CURRENT_PACKAGES_DIR}/share/assimp/assimp-config.cmake ASSIMP_CONFIG)