diff options
| author | Erik Kundiman <erik@megapahit.org> | 2024-09-03 20:50:59 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-09-03 20:50:59 +0800 |
| commit | 825c3b0f797a3b5ffb56ef70d08ffef1a52fa26b (patch) | |
| tree | fdf1e4e9041d336a5f246de21c42877c40464c27 | |
| parent | d070095451f7d25d76cc3c7d7274a4b32f2aa463 (diff) | |
| parent | cd4e9098c148dd35002c167fde7febc02849c86a (diff) | |
Merge pull request #10 from oikumene/freebsd
So, it was minizip, not minizip-ng. Sorry.
| -rw-r--r-- | patches/collada-dom-v2.3-r7.patch | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/patches/collada-dom-v2.3-r7.patch b/patches/collada-dom-v2.3-r7.patch index fce2b934d1..4c36e83891 100644 --- a/patches/collada-dom-v2.3-r7.patch +++ b/patches/collada-dom-v2.3-r7.patch @@ -1,8 +1,8 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index b1c1993..7bd70d4 100644 +index b1c1993..d9787be 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -1,14 +1,41 @@ +@@ -1,14 +1,37 @@ -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) @@ -14,11 +14,7 @@ index b1c1993..7bd70d4 100644 + +find_package(Boost REQUIRED CONFIG) +pkg_check_modules(LIBXML2 libxml-2.0) -+if(LINUX) -+ pkg_check_modules(MINIZIP minizip) -+else(LINUX) -+ pkg_check_modules(MINIZIP minizip-ng) -+endif(LINUX) ++pkg_check_modules(MINIZIP minizip) +pkg_check_modules(ZLIB zlib) + +set(COLLADA_DOM_SOVERSION "0") |