|
@@ -6,6 +6,7 @@ package("assimp")
|
|
|
|
|
|
set_urls("https://github.com/assimp/assimp/archive/$(version).zip",
|
|
set_urls("https://github.com/assimp/assimp/archive/$(version).zip",
|
|
"https://github.com/assimp/assimp.git")
|
|
"https://github.com/assimp/assimp.git")
|
|
|
|
+ add_versions("v5.2.4", "713e9aa035ae019e5f3f0de1605de308d63538897249a2ba3a2d7d40036ad2b1")
|
|
add_versions("v5.2.3", "9667cfc8ddabd5dd5e83f3aebb99dbf232fce99f17b9fe59540dccbb5e347393")
|
|
add_versions("v5.2.3", "9667cfc8ddabd5dd5e83f3aebb99dbf232fce99f17b9fe59540dccbb5e347393")
|
|
add_versions("v5.2.2", "7b833182b89917b3c6e8aee6432b74870fb71f432cc34aec5f5411bd6b56c1b5")
|
|
add_versions("v5.2.2", "7b833182b89917b3c6e8aee6432b74870fb71f432cc34aec5f5411bd6b56c1b5")
|
|
add_versions("v5.2.1", "636fe5c2cfe925b559b5d89e53a42412a2d2ab49a0712b7d655d1b84c51ed504")
|
|
add_versions("v5.2.1", "636fe5c2cfe925b559b5d89e53a42412a2d2ab49a0712b7d655d1b84c51ed504")
|
|
@@ -18,6 +19,7 @@ package("assimp")
|
|
add_patches("v5.2.2", path.join(os.scriptdir(), "patches", "5.2.1", "fix_zlib_filefunc_def.patch"), "a9f8a9aa1975888ea751b80c8268296dee901288011eeb1addf518eac40b71b1")
|
|
add_patches("v5.2.2", path.join(os.scriptdir(), "patches", "5.2.1", "fix_zlib_filefunc_def.patch"), "a9f8a9aa1975888ea751b80c8268296dee901288011eeb1addf518eac40b71b1")
|
|
add_patches("v5.2.3", path.join(os.scriptdir(), "patches", "5.2.1", "fix_zlib_filefunc_def.patch"), "a9f8a9aa1975888ea751b80c8268296dee901288011eeb1addf518eac40b71b1")
|
|
add_patches("v5.2.3", path.join(os.scriptdir(), "patches", "5.2.1", "fix_zlib_filefunc_def.patch"), "a9f8a9aa1975888ea751b80c8268296dee901288011eeb1addf518eac40b71b1")
|
|
add_patches("v5.2.3", path.join(os.scriptdir(), "patches", "5.2.3", "cmake_static_crt.patch"), "3872a69976055bed9e40814e89a24a3420692885b50e9f9438036e8d809aafb4")
|
|
add_patches("v5.2.3", path.join(os.scriptdir(), "patches", "5.2.3", "cmake_static_crt.patch"), "3872a69976055bed9e40814e89a24a3420692885b50e9f9438036e8d809aafb4")
|
|
|
|
+ add_patches("v5.2.4", path.join(os.scriptdir(), "patches", "5.2.4", "fix_x86_windows_build.patch"), "becb4039c220678cf1e888e3479f8e68d1964c49d58f14c5d247c86b4a5c3293")
|
|
|
|
|
|
if not is_host("windows") then
|
|
if not is_host("windows") then
|
|
add_extsources("pkgconfig::assimp")
|
|
add_extsources("pkgconfig::assimp")
|
|
@@ -61,7 +63,8 @@ package("assimp")
|
|
"-DASSIMP_INSTALL_PDB=ON",
|
|
"-DASSIMP_INSTALL_PDB=ON",
|
|
"-DASSIMP_INJECT_DEBUG_POSTFIX=ON",
|
|
"-DASSIMP_INJECT_DEBUG_POSTFIX=ON",
|
|
"-DASSIMP_BUILD_ZLIB=ON",
|
|
"-DASSIMP_BUILD_ZLIB=ON",
|
|
- "-DSYSTEM_IRRXML=ON"}
|
|
|
|
|
|
+ "-DSYSTEM_IRRXML=ON",
|
|
|
|
+ "-DASSIMP_WARNINGS_AS_ERRORS=OFF"}
|
|
table.insert(configs, "-DCMAKE_BUILD_TYPE=" .. (package:debug() and "Debug" or "Release"))
|
|
table.insert(configs, "-DCMAKE_BUILD_TYPE=" .. (package:debug() and "Debug" or "Release"))
|
|
|
|
|
|
local function add_config_arg(config_name, cmake_name)
|
|
local function add_config_arg(config_name, cmake_name)
|
|
@@ -82,6 +85,14 @@ package("assimp")
|
|
table.insert(configs, "-DASSIMP_BUILD_ASSIMP_TOOLS=OFF")
|
|
table.insert(configs, "-DASSIMP_BUILD_ASSIMP_TOOLS=OFF")
|
|
end
|
|
end
|
|
|
|
|
|
|
|
+ if package:version():lt("v5.2.4") then
|
|
|
|
+ -- ASSIMP_WARNINGS_AS_ERRORS is not supported before v5.2.4
|
|
|
|
+ if package:is_plat("windows") then
|
|
|
|
+ io.replace("code/CMakeLists.txt", "TARGET_COMPILE_OPTIONS(assimp PRIVATE /W4 /WX)", "", {plain = true})
|
|
|
|
+ else
|
|
|
|
+ io.replace("code/CMakeLists.txt", "TARGET_COMPILE_OPTIONS(assimp PRIVATE -Werror)", "", {plain = true})
|
|
|
|
+ end
|
|
|
|
+ end
|
|
if package:is_plat("mingw") and package:version():lt("v5.1.5") then
|
|
if package:is_plat("mingw") and package:version():lt("v5.1.5") then
|
|
-- CMAKE_COMPILER_IS_MINGW has been removed: https://github.com/assimp/assimp/pull/4311
|
|
-- CMAKE_COMPILER_IS_MINGW has been removed: https://github.com/assimp/assimp/pull/4311
|
|
io.replace("CMakeLists.txt", "CMAKE_COMPILER_IS_MINGW", "MINGW", {plain = true})
|
|
io.replace("CMakeLists.txt", "CMAKE_COMPILER_IS_MINGW", "MINGW", {plain = true})
|