diff --git a/charls_add_cmake_install_target.patch b/charls_add_cmake_install_target.patch new file mode 100644 index 0000000..ad25b93 --- /dev/null +++ b/charls_add_cmake_install_target.patch @@ -0,0 +1,24 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 8304f0d..88f0949 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -12,6 +12,11 @@ SET(CMAKE_CXX_FLAGS "-D NDEBUG -O3" ) + ENDIF(CMAKE_COMPILER_IS_GNUCC) + ENDIF(NOT CMAKE_BUILD_TYPE) + ++SET( charls_HEADERS "colortransform.h" "context.h" "decoderstrategy.h" "encoderstrategy.h" "interface ++.h" "losslesstraits.h" "scan.h" "streams.h" "config.h" "contextrunmode.h" "defaulttrait ++.h" "header.h" "lookuptable.h" "processline.h" "stdafx.h" "util.h" ++) ++ + OPTION(charls_BUILD_SHARED_LIBS "Build CharLS with shared libraries." OFF) + SET(BUILD_SHARED_LIBS ${charls_BUILD_SHARED_LIBS}) + +@@ -21,3 +26,7 @@ add_library(CharLS header.cpp interface.cpp jpegls.cpp ) + add_executable(charlstest test/main.cpp test/time.cpp test/util.cpp test/bitstreamdamage.cpp test/compliance.cpp test/performance.cpp test/dicomsamples.cpp) + target_link_libraries (charlstest CharLS) + ++# Installs the header files into the {build_dir}/include/libcharls directory ++install(FILES ${charls_HEADERS} DESTINATION include/CharLS) ++ ++ diff --git a/charls_add_sharedlib_soname.patch b/charls_add_sharedlib_soname.patch new file mode 100644 index 0000000..35dee21 --- /dev/null +++ b/charls_add_sharedlib_soname.patch @@ -0,0 +1,36 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 88f0949..c57ef72 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -20,8 +20,21 @@ SET( charls_HEADERS "colortransform.h" "context.h" "decoderstrategy.h" "encode + OPTION(charls_BUILD_SHARED_LIBS "Build CharLS with shared libraries." OFF) + SET(BUILD_SHARED_LIBS ${charls_BUILD_SHARED_LIBS}) + +-add_library(CharLS header.cpp interface.cpp jpegls.cpp ) ++# Add soname to generated shared lib + ++SET(CHARLS_LIB_MAJOR_VERSION 1) ++SET(CHARLS_LIB_MINOR_VERSION 0) ++ ++IF(BUILD_SHARED_LIBS) ++ add_library(CharLS SHARED header.cpp interface.cpp jpegls.cpp ++ stdafx.cpp ++ ) ++ set_target_properties( CharLS PROPERTIES ++ VERSION ${CHARLS_LIB_MAJOR_VERSION}.${CHARLS_LIB_MINOR_VERSION} ++ SOVERSION ${CHARLS_LIB_MAJOR_VERSION} ++ ) ++ ++ENDIF(BUILD_SHARED_LIBS) + + add_executable(charlstest test/main.cpp test/time.cpp test/util.cpp test/bitstreamdamage.cpp test/compliance.cpp test/performance.cpp test/dicomsamples.cpp) + target_link_libraries (charlstest CharLS) +@@ -29,4 +42,8 @@ target_link_libraries (charlstest CharLS) + # Installs the header files into the {build_dir}/include/libcharls directory + install(FILES ${charls_HEADERS} DESTINATION include/CharLS) + ++# Installs the target file (libCharLS.so) into the {build_dir}/lib directory ++install(TARGETS CharLS LIBRARY DESTINATION lib${LIB_SUFFIX}) ++ ++ +