|
 |
00790f8 |
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
|
987ee20 |
index 2bc3458..46b9ee6 100644
|
|
|
00790f8 |
--- a/CMakeLists.txt
|
|
|
00790f8 |
+++ b/CMakeLists.txt
|
|
|
987ee20 |
@@ -1328,7 +1328,7 @@ set(EXE ${CMAKE_EXECUTABLE_SUFFIX})
|
|
|
00790f8 |
|
|
|
00790f8 |
if(WITH_TURBOJPEG)
|
|
|
00790f8 |
if(ENABLE_SHARED)
|
|
|
00790f8 |
- install(TARGETS turbojpeg tjbench
|
|
|
00790f8 |
+ install(TARGETS turbojpeg
|
|
|
00790f8 |
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
|
|
|
00790f8 |
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
|
|
|
00790f8 |
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
|
|
|
987ee20 |
@@ -1341,15 +1341,6 @@ if(WITH_TURBOJPEG)
|
|
|
00790f8 |
if(ENABLE_STATIC)
|
|
|
00790f8 |
install(TARGETS turbojpeg-static ARCHIVE
|
|
|
00790f8 |
DESTINATION ${CMAKE_INSTALL_LIBDIR})
|
|
|
00790f8 |
- if(NOT ENABLE_SHARED)
|
|
|
987ee20 |
- if(MSVC_IDE)
|
|
|
987ee20 |
- set(DIR "${CMAKE_CURRENT_BINARY_DIR}/\${CMAKE_INSTALL_CONFIG_NAME}")
|
|
|
987ee20 |
- else()
|
|
|
987ee20 |
- set(DIR ${CMAKE_CURRENT_BINARY_DIR})
|
|
|
987ee20 |
- endif()
|
|
|
987ee20 |
- install(PROGRAMS ${DIR}/tjbench-static${EXE}
|
|
|
00790f8 |
- DESTINATION ${CMAKE_INSTALL_BINDIR} RENAME tjbench${EXE})
|
|
|
00790f8 |
- endif()
|
|
|
00790f8 |
endif()
|
|
|
00790f8 |
install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/turbojpeg.h
|
|
|
00790f8 |
DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
|
|
|
987ee20 |
@@ -1374,18 +1365,6 @@ endif()
|
|
|
00790f8 |
|
|
|
00790f8 |
install(TARGETS rdjpgcom wrjpgcom RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
|
|
|
00790f8 |
|
|
|
00790f8 |
-install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/README.ijg
|
|
|
00790f8 |
- ${CMAKE_CURRENT_SOURCE_DIR}/README.md ${CMAKE_CURRENT_SOURCE_DIR}/example.txt
|
|
|
00790f8 |
- ${CMAKE_CURRENT_SOURCE_DIR}/tjexample.c
|
|
|
00790f8 |
- ${CMAKE_CURRENT_SOURCE_DIR}/libjpeg.txt
|
|
|
00790f8 |
- ${CMAKE_CURRENT_SOURCE_DIR}/structure.txt
|
|
|
00790f8 |
- ${CMAKE_CURRENT_SOURCE_DIR}/usage.txt ${CMAKE_CURRENT_SOURCE_DIR}/wizard.txt
|
|
|
00790f8 |
- ${CMAKE_CURRENT_SOURCE_DIR}/LICENSE.md DESTINATION ${CMAKE_INSTALL_DOCDIR})
|
|
|
00790f8 |
-if(WITH_JAVA)
|
|
|
00790f8 |
- install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/java/TJExample.java
|
|
|
00790f8 |
- DESTINATION ${CMAKE_INSTALL_DOCDIR})
|
|
|
00790f8 |
-endif()
|
|
|
00790f8 |
-
|
|
|
00790f8 |
if(UNIX OR MINGW)
|
|
|
00790f8 |
install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/cjpeg.1
|
|
|
00790f8 |
${CMAKE_CURRENT_SOURCE_DIR}/djpeg.1 ${CMAKE_CURRENT_SOURCE_DIR}/jpegtran.1
|
|
|
987ee20 |
@@ -1399,7 +1378,7 @@ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/pkgscripts/libjpeg.pc
|
|
|
00790f8 |
|
|
|
00790f8 |
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/jconfig.h
|
|
|
00790f8 |
${CMAKE_CURRENT_SOURCE_DIR}/jerror.h ${CMAKE_CURRENT_SOURCE_DIR}/jmorecfg.h
|
|
|
00790f8 |
- ${CMAKE_CURRENT_SOURCE_DIR}/jpeglib.h
|
|
|
00790f8 |
+ ${CMAKE_CURRENT_SOURCE_DIR}/jpeglib.h ${CMAKE_CURRENT_SOURCE_DIR}/jpegint.h
|
|
|
00790f8 |
DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
|
|
|
00790f8 |
|
|
|
00790f8 |
include(cmakescripts/BuildPackages.cmake)
|