blob: 0878993b45b3f46471525869bef3124704381e42 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
|
--- 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/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)
|