58 lines
2.4 KiB
Diff
58 lines
2.4 KiB
Diff
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
index cca2966..4875bf3 100644
|
|
--- a/CMakeLists.txt
|
|
+++ b/CMakeLists.txt
|
|
@@ -1434,8 +1434,6 @@ if(WITH_TURBOJPEG)
|
|
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
|
|
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
|
|
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
|
|
- install(TARGETS tjbench
|
|
- RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
|
|
if(NOT CMAKE_VERSION VERSION_LESS "3.1" AND MSVC AND
|
|
CMAKE_C_LINKER_SUPPORTS_PDB)
|
|
install(FILES "$<TARGET_PDB_FILE:turbojpeg>"
|
|
@@ -1446,15 +1444,6 @@ if(WITH_TURBOJPEG)
|
|
install(TARGETS turbojpeg-static EXPORT ${CMAKE_PROJECT_NAME}Targets
|
|
INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
|
|
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
|
|
- if(NOT ENABLE_SHARED)
|
|
- if(MSVC_IDE OR XCODE)
|
|
- set(DIR "${CMAKE_CURRENT_BINARY_DIR}/\${CMAKE_INSTALL_CONFIG_NAME}")
|
|
- else()
|
|
- set(DIR ${CMAKE_CURRENT_BINARY_DIR})
|
|
- endif()
|
|
- install(PROGRAMS ${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})
|
|
@@ -1481,18 +1470,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
|
|
@@ -1516,7 +1493,7 @@ install(EXPORT ${CMAKE_PROJECT_NAME}Targets
|
|
|
|
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)
|