commit
8fc2cf0bd6
@ -1,52 +0,0 @@
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index cc548f5..023ff66 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -1314,7 +1314,7 @@ endif()
|
||||
|
||||
if(WITH_TURBOJPEG)
|
||||
if(ENABLE_SHARED)
|
||||
- install(TARGETS turbojpeg tjbench
|
||||
+ install(TARGETS turbojpeg
|
||||
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
|
||||
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
|
||||
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
|
||||
@@ -1322,10 +1322,6 @@ if(WITH_TURBOJPEG)
|
||||
if(ENABLE_STATIC)
|
||||
install(TARGETS turbojpeg-static ARCHIVE
|
||||
DESTINATION ${CMAKE_INSTALL_LIBDIR})
|
||||
- if(NOT ENABLE_SHARED)
|
||||
- install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/tjbench-static${EXE}
|
||||
- DESTINATION ${CMAKE_INSTALL_BINDIR} RENAME tjbench${EXE})
|
||||
- endif()
|
||||
endif()
|
||||
install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/turbojpeg.h
|
||||
DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
|
||||
@@ -1345,18 +1341,6 @@ endif()
|
||||
|
||||
install(TARGETS rdjpgcom wrjpgcom RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
|
||||
|
||||
-install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/README.ijg
|
||||
- ${CMAKE_CURRENT_SOURCE_DIR}/README.md ${CMAKE_CURRENT_SOURCE_DIR}/example.txt
|
||||
- ${CMAKE_CURRENT_SOURCE_DIR}/tjexample.c
|
||||
- ${CMAKE_CURRENT_SOURCE_DIR}/libjpeg.txt
|
||||
- ${CMAKE_CURRENT_SOURCE_DIR}/structure.txt
|
||||
- ${CMAKE_CURRENT_SOURCE_DIR}/usage.txt ${CMAKE_CURRENT_SOURCE_DIR}/wizard.txt
|
||||
- ${CMAKE_CURRENT_SOURCE_DIR}/LICENSE.md DESTINATION ${CMAKE_INSTALL_DOCDIR})
|
||||
-if(WITH_JAVA)
|
||||
- install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/java/TJExample.java
|
||||
- DESTINATION ${CMAKE_INSTALL_DOCDIR})
|
||||
-endif()
|
||||
-
|
||||
if(UNIX OR MINGW)
|
||||
install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/cjpeg.1
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/djpeg.1 ${CMAKE_CURRENT_SOURCE_DIR}/jpegtran.1
|
||||
@@ -1370,7 +1354,7 @@ endif()
|
||||
|
||||
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/jconfig.h
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/jerror.h ${CMAKE_CURRENT_SOURCE_DIR}/jmorecfg.h
|
||||
- ${CMAKE_CURRENT_SOURCE_DIR}/jpeglib.h
|
||||
+ ${CMAKE_CURRENT_SOURCE_DIR}/jpeglib.h ${CMAKE_CURRENT_SOURCE_DIR}/jpegint.h
|
||||
DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
|
||||
|
||||
include(cmakescripts/BuildPackages.cmake)
|
||||
@ -6,8 +6,6 @@ License: IJG
|
||||
URL: http://sourceforge.net/projects/libjpeg-turbo
|
||||
Source0: http://downloads.sourceforge.net/libjpeg-turbo/libjpeg-turbo-%{version}.tar.gz
|
||||
|
||||
Patch0: libjpeg-turbo-cmake.patch
|
||||
|
||||
BuildRequires: gcc cmake libtool nasm
|
||||
|
||||
Obsoletes: libjpeg < 6b-47 turbojpeg = %{version}-%{release}
|
||||
@ -90,6 +88,7 @@ LD_LIBRARY_PATH=%{buildroot}%{_libdir} make test %{?_smp_mflags}
|
||||
%{_bindir}/*
|
||||
%{_libdir}/libjpeg.so.62*
|
||||
%{_libdir}/libturbojpeg.so.0*
|
||||
%exclude /usr/share/doc/libjpeg-turbo/*
|
||||
|
||||
%files devel
|
||||
%doc coderules.txt jconfig.txt libjpeg.txt structure.txt example.txt tjexample.c
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user