Fix some error with cmake
This commit is contained in:
parent
3da66d4d79
commit
74583409ec
1
CHANGES
1
CHANGES
|
@ -7,6 +7,7 @@ What's New for OpenJPEG
|
|||
|
||||
June 3, 2011
|
||||
+ [malaterre] adding partno and numpart info as part of the warning message (issue #69)
|
||||
+ [malaterre] make sure that cmake build system works on debian
|
||||
|
||||
May 23, 2011
|
||||
* [antonin] fixed a bug in autotools that prevented "make distcheck" to work properly (credit to Vincent Torri)
|
||||
|
|
|
@ -86,7 +86,7 @@ ENDIF()
|
|||
SET(HAVE_LCMS2_H 1)
|
||||
SET(HAVE_LIBLCMS2 1)
|
||||
#
|
||||
ADD_SUBDIRECTORY(${OPENJPEG_SOURCE_DIR}/thirdparty)
|
||||
#ADD_SUBDIRECTORY(${OPENJPEG_SOURCE_DIR}/thirdparty)
|
||||
#
|
||||
LINK_DIRECTORIES(${CMAKE_BINARY_DIR}/thirdparty/lib)
|
||||
#
|
||||
|
@ -127,4 +127,4 @@ ENDIF(BUILD_CODEC)
|
|||
IF(BUILD_MJ2)
|
||||
ADD_SUBDIRECTORY(mj2)
|
||||
ENDIF(BUILD_MJ2)
|
||||
#
|
||||
#
|
||||
|
|
|
@ -37,7 +37,11 @@ ENDIF(WIN32)
|
|||
FOREACH(exe j2k_to_image image_to_j2k j2k_dump)
|
||||
ADD_EXECUTABLE(${exe} ${exe}.c ${common_SRCS})
|
||||
TARGET_LINK_LIBRARIES(${exe} ${OPENJPEG_LIBRARY_NAME}
|
||||
${LCMS_LIBNAME} ${Z_LIBNAME} ${PNG_LIBNAME} ${TIFF_LIBNAME})
|
||||
${Z_LIBNAME} ${PNG_LIBNAME} ${TIFF_LIBNAME})
|
||||
|
||||
IF(LCMS_FOUND OR LCMS2_FOUND)
|
||||
TARGET_LINK_LIBRARIES(${exe} ${LCMS_LIBNAME})
|
||||
ENDIF(LCMS_FOUND OR LCMS2_FOUND)
|
||||
|
||||
ADD_TEST(${exe} ${EXECUTABLE_OUTPUT_PATH}/${exe})
|
||||
# calling those exe without option will make them fail always:
|
||||
|
|
Loading…
Reference in New Issue