diff options
| author | Hiroo Ono <hiroo.ono@gmail.com> | 2024-09-02 22:50:37 +0900 |
|---|---|---|
| committer | Hiroo Ono <hiroo.ono@gmail.com> | 2024-09-02 22:53:30 +0900 |
| commit | 68a3c60cfec78ae8b6d2477cc4220ad3892b08a4 (patch) | |
| tree | 0131c358c94e17ae1faf74080150689a834e7a9f | |
| parent | d07955fa24a2c8a2b118ace6dc7517db5445a53a (diff) | |
Fix build.
* check for minizip (not minizip-ng) on Linux (Debian)
* added find_package(Boost REQUIRED CONFIG) in collada-dom build
for Linux and FreeBSD
| -rw-r--r-- | patches/collada-dom-v2.3-r7.patch | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/patches/collada-dom-v2.3-r7.patch b/patches/collada-dom-v2.3-r7.patch index 485693ec7a..b98965d986 100644 --- a/patches/collada-dom-v2.3-r7.patch +++ b/patches/collada-dom-v2.3-r7.patch @@ -1,21 +1,27 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index b1c1993..9df2dee 100644 +index b1c1993..3cbf2fb 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -1,14 +1,35 @@ +@@ -1,14 +1,41 @@ -include_directories(${CMAKE_CURRENT_SOURCE_DIR}/include) -set(COLLADA14_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/include/1.4) -set(COLLADA15_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/include/1.5) +project(colladadom) +cmake_minimum_required(VERSION 3.17) ++cmake_policy(SET CMP0167 NEW) + +include(FindPkgConfig) + ++find_package(Boost REQUIRED CONFIG) +pkg_check_modules(LIBXML2 libxml-2.0) -+pkg_check_modules(MINIZIP minizip-ng) ++if(LINUX) ++ pkg_check_modules(MINIZIP minizip) ++else(LINUX) ++ pkg_check_modules(MINIZIP minizip-ng) ++endif(LINUX) +pkg_check_modules(ZLIB zlib) + -+set(COLLADA_DOM_SOVERSION "2") ++set(COLLADA_DOM_SOVERSION "0") +set(COLLADA_DOM_VERSION "2.3") +set(COLLADA_DOM_INCLUDE_INSTALL_DIR + ${CMAKE_BINARY_DIR}/packages/include/collada |