summarylogtreecommitdiffstats
path: root/0003-versioned-dlls.mingw.patch
blob: 5f9b7758a00086e034bbaad773b47280d29a1ace (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
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(NOT ${CMAKE_VERSION} VERSION_LESS "2.8.12")
   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(NOT ${CMAKE_VERSION} VERSION_LESS "2.8.12")
   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(NOT ${CMAKE_VERSION} VERSION_LESS "2.8.12")
   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(NOT ${CMAKE_VERSION} VERSION_LESS "2.8.12")
   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(NOT ${CMAKE_VERSION} VERSION_LESS "2.8.12")
   target_compile_options(${OPENMJ2_LIBRARY_NAME} PRIVATE ${OPENJPEG_LIBRARY_COMPILE_OPTIONS})
 endif()