diff options
Diffstat (limited to '0003-versioned-dlls.mingw.patch')
| -rw-r--r-- | 0003-versioned-dlls.mingw.patch | 55 |
1 files changed, 55 insertions, 0 deletions
diff --git a/0003-versioned-dlls.mingw.patch b/0003-versioned-dlls.mingw.patch new file mode 100644 index 000000000000..f93d3d162ba1 --- /dev/null +++ b/0003-versioned-dlls.mingw.patch @@ -0,0 +1,55 @@ +--- openjpeg-2.1.2/src/lib/openjp2/CMakeLists.txt.orig 2016-10-01 08:31:32.273920100 -0400 ++++ openjpeg-2.1.2/src/lib/openjp2/CMakeLists.txt 2016-10-01 08:36:28.474703900 -0400 +@@ -85,7 +85,7 @@ + if(UNIX) + target_link_libraries(${OPENJPEG_LIBRARY_NAME} m) + 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(${CMAKE_VERSION} VERSION_GREATER "2.8.11") + target_compile_options(${OPENJPEG_LIBRARY_NAME} PRIVATE ${OPENJPEG_LIBRARY_COMPILE_OPTIONS}) + endif() +--- openjpeg-2.1.2/src/lib/openjp3d/CMakeLists.txt.orig 2016-10-01 08:59:49.819661900 -0400 ++++ openjpeg-2.1.2/src/lib/openjp3d/CMakeLists.txt 2016-10-01 09:33:11.456919300 -0400 +@@ -26,7 +26,7 @@ + if(UNIX) + target_link_libraries(${OPENJP3D_LIBRARY_NAME} m) + endif() +-set_target_properties(${OPENJP3D_LIBRARY_NAME} PROPERTIES ${OPENJPEG_LIBRARY_PROPERTIES}) ++set_target_properties(${OPENJP3D_LIBRARY_NAME} PROPERTIES ${OPENJPEG_LIBRARY_PROPERTIES} OUTPUT_NAME openjp3d RUNTIME_OUTPUT_NAME openjp3d-${OPENJPEG_SOVERSION} ARCHIVE_OUTPUT_NAME openjp3d) + if(${CMAKE_VERSION} VERSION_GREATER "2.8.11") + target_compile_options(${OPENJP3D_LIBRARY_NAME} PRIVATE ${OPENJPEG_LIBRARY_COMPILE_OPTIONS}) + endif() +--- 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(${CMAKE_VERSION} VERSION_GREATER "2.8.11") + target_compile_options(openjpip PRIVATE ${OPENJPEG_LIBRARY_COMPILE_OPTIONS}) + endif() +-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) + # add Winsock on windows+mingw + target_link_libraries(openjpip ws2_32) +--- openjpeg-2.1.2/src/lib/openjpwl/CMakeLists.txt.orig 2016-10-01 08:59:49.830163000 -0400 ++++ openjpeg-2.1.2/src/lib/openjpwl/CMakeLists.txt 2016-10-01 09:38:06.899451900 -0400 +@@ -50,7 +50,7 @@ + target_link_libraries(openjpwl m) + endif() + set_target_properties(openjpwl +- PROPERTIES ${OPENJPEG_LIBRARY_PROPERTIES}) ++ PROPERTIES ${OPENJPEG_LIBRARY_PROPERTIES} OUTPUT_NAME openjpwl RUNTIME_OUTPUT_NAME openjpwl-${OPENJPEG_SOVERSION} ARCHIVE_OUTPUT_NAME openjpwl) + if(${CMAKE_VERSION} VERSION_GREATER "2.8.11") + target_compile_options(openjpwl PRIVATE ${OPENJPEG_LIBRARY_COMPILE_OPTIONS}) + endif() +--- openjpeg-2.1.2/src/lib/openmj2/CMakeLists.txt.orig 2016-10-01 08:59:49.839164400 -0400 ++++ openjpeg-2.1.2/src/lib/openmj2/CMakeLists.txt 2016-10-01 09:44:10.251707400 -0400 +@@ -45,7 +45,7 @@ + if(UNIX) + target_link_libraries(${OPENMJ2_LIBRARY_NAME} m) + endif() +-set_target_properties(${OPENMJ2_LIBRARY_NAME} PROPERTIES ${OPENJPEG_LIBRARY_PROPERTIES}) ++set_target_properties(${OPENMJ2_LIBRARY_NAME} PROPERTIES ${OPENJPEG_LIBRARY_PROPERTIES} OUTPUT_NAME openmj2 RUNTIME_OUTPUT_NAME openmj2-${OPENJPEG_SOVERSION} ARCHIVE_OUTPUT_NAME openmj2) + if(${CMAKE_VERSION} VERSION_GREATER "2.8.11") + target_compile_options(${OPENMJ2_LIBRARY_NAME} PRIVATE ${OPENJPEG_LIBRARY_COMPILE_OPTIONS}) + endif() |