summarylogtreecommitdiffstats
path: root/0003-versioned-dlls.mingw.patch
diff options
context:
space:
mode:
authorpingplug2024-04-01 21:50:58 +0800
committerpingplug2024-04-01 21:50:58 +0800
commit0320c5f5165f8c4644f6d8a07cf8061baca42803 (patch)
treec67b4d0fe20ba53ba8b38b757da785ae186a7db3 /0003-versioned-dlls.mingw.patch
parent477fdb7daeb7ae815a5a597ab90d135d40bf5c4d (diff)
downloadaur-mingw-w64-openjpeg2.tar.gz
updated to 2.5.2
Diffstat (limited to '0003-versioned-dlls.mingw.patch')
-rw-r--r--0003-versioned-dlls.mingw.patch12
1 files changed, 6 insertions, 6 deletions
diff --git a/0003-versioned-dlls.mingw.patch b/0003-versioned-dlls.mingw.patch
index 0878993b45b3..a0410813168f 100644
--- a/0003-versioned-dlls.mingw.patch
+++ b/0003-versioned-dlls.mingw.patch
@@ -6,15 +6,15 @@
endif()
-set_target_properties(${OPENJPEG_LIBRARY_NAME} PROPERTIES ${OPENJPEG_LIBRARY_PROPERTIES})
+set_target_properties(${OPENJPEG_LIBRARY_NAME} PROPERTIES ${OPENJPEG_LIBRARY_PROPERTIES} OUTPUT_NAME openjp2 RUNTIME_OUTPUT_NAME openjp2-${OPENJPEG_SOVERSION} ARCHIVE_OUTPUT_NAME openjp2)
- if(NOT ${CMAKE_VERSION} VERSION_LESS "2.8.12")
- target_compile_options(${OPENJPEG_LIBRARY_NAME} PRIVATE ${OPENJPEG_LIBRARY_COMPILE_OPTIONS})
- endif()
+ target_compile_options(${OPENJPEG_LIBRARY_NAME} PRIVATE ${OPENJP2_COMPILE_OPTIONS})
+
+ # Install library
--- openjpeg-2.1.2/src/lib/openjpip/CMakeLists.txt.orig 2016-10-01 08:31:32.305170000 -0400
+++ openjpeg-2.1.2/src/lib/openjpip/CMakeLists.txt 2016-10-01 08:40:01.492903300 -0400
@@ -65,7 +65,7 @@
- if(NOT ${CMAKE_VERSION} VERSION_LESS "2.8.12")
- target_compile_options(openjpip PRIVATE ${OPENJPEG_LIBRARY_COMPILE_OPTIONS})
- endif()
+ set_target_properties(openjpip
+ PROPERTIES ${OPENJPEG_LIBRARY_PROPERTIES})
+ target_compile_options(openjpip PRIVATE ${OPENJPEG_LIBRARY_COMPILE_OPTIONS})
-target_link_libraries(openjpip ${OPENJPEG_LIBRARY_NAME})
+set_target_properties(${OPENJPEG_LIBRARY_NAME} PROPERTIES ${OPENJPEG_LIBRARY_PROPERTIES} OUTPUT_NAME openjpip RUNTIME_OUTPUT_NAME openjp3d-${OPENJPEG_SOVERSION} ARCHIVE_OUTPUT_NAME openjpip)
if(WIN32)