diff options
| author | Mathieu Malaterre <mathieu.malaterre@gmail.com> | 2014-03-25 16:42:49 +0000 |
|---|---|---|
| committer | Mathieu Malaterre <mathieu.malaterre@gmail.com> | 2014-03-25 16:42:49 +0000 |
| commit | 4140dfdea8aaaf3536eb8ebbadd6a9c4fdab09d5 (patch) | |
| tree | e1bcb7e06b213487fcf1534f5d7abc5d8ec1f5e3 | |
| parent | 259f629a46b293aab33be8e3ccff8a680b457204 (diff) | |
[1.5] Import patch from bug tracker
Thanks to winfried
Fixes issue 304
| -rw-r--r-- | applications/codec/Makefile.am | 4 | ||||
| -rw-r--r-- | applications/jpip/libopenjpip/CMakeLists.txt | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/applications/codec/Makefile.am b/applications/codec/Makefile.am index 17be3b88..1e31e464 100644 --- a/applications/codec/Makefile.am +++ b/applications/codec/Makefile.am @@ -78,7 +78,7 @@ JPWL_j2k_to_image_CPPFLAGS = \ @LCMS1_CFLAGS@ \ @LCMS2_CFLAGS@ JPWL_j2k_to_image_CFLAGS = -JPWL_j2k_to_image_LDADD = $(top_builddir)/libopenjpeg/jpwl/libopenjpeg_JPWL.la @LCMS1_LIBS@ @LCMS2_LIBS@ @TIFF_LIBS@ @PNG_LIBS@ +JPWL_j2k_to_image_LDADD = $(top_builddir)/libopenjpeg/jpwl/libopenjpeg_JPWL.la @LCMS1_LIBS@ @LCMS2_LIBS@ @TIFF_LIBS@ @PNG_LIBS@ -lm JPWL_j2k_to_image_SOURCES = \ ../common/color.c \ ../common/opj_getopt.c \ @@ -96,7 +96,7 @@ JPWL_image_to_j2k_CPPFLAGS = \ @TIFF_CFLAGS@ \ @PNG_CFLAGS@ JPWL_image_to_j2k_CFLAGS = -JPWL_image_to_j2k_LDADD = $(top_builddir)/libopenjpeg/jpwl/libopenjpeg_JPWL.la @TIFF_LIBS@ @PNG_LIBS@ +JPWL_image_to_j2k_LDADD = $(top_builddir)/libopenjpeg/jpwl/libopenjpeg_JPWL.la @TIFF_LIBS@ @PNG_LIBS@ -lm JPWL_image_to_j2k_SOURCES = \ ../common/opj_getopt.c \ diff --git a/applications/jpip/libopenjpip/CMakeLists.txt b/applications/jpip/libopenjpip/CMakeLists.txt index 56ab057d..daa00f45 100644 --- a/applications/jpip/libopenjpip/CMakeLists.txt +++ b/applications/jpip/libopenjpip/CMakeLists.txt @@ -62,7 +62,7 @@ INSTALL(TARGETS openjpip_local IF(BUILD_JPIP_SERVER) ADD_LIBRARY(openjpip_server STATIC ${OPENJPIP_SRCS} ${SERVER_SRCS}) - TARGET_LINK_LIBRARIES(openjpip_server ${FCGI_LIBRARIES} ${CURL_LIBRARIES} ${CMAKE_THREAD_LIBS}) + TARGET_LINK_LIBRARIES(openjpip_server ${FCGI_LIBRARIES} ${CURL_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT}) SET_TARGET_PROPERTIES(openjpip_server PROPERTIES COMPILE_FLAGS "-DSERVER") INSTALL(TARGETS openjpip_server |