mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-18 21:48:23 +08:00
3513e92bf9
* fix mozjpeg build * re-disable in CI baseline * fix static install * rename static libs, add pkgconfig fixup * update version string Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com> Co-authored-by: Robert Schumacher <roschuma@microsoft.com>
34 lines
1.3 KiB
Diff
34 lines
1.3 KiB
Diff
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
--- a/CMakeLists.txt
|
|
+++ b/CMakeLists.txt
|
|
@@ -1369,13 +1369,13 @@
|
|
###############################################################################
|
|
|
|
set(EXE ${CMAKE_EXECUTABLE_SUFFIX})
|
|
|
|
if(WITH_TURBOJPEG)
|
|
if(ENABLE_SHARED)
|
|
- install(TARGETS turbojpeg tjbench
|
|
+ install(TARGETS turbojpeg #tjbench
|
|
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
|
|
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
|
|
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>"
|
|
@@ -1413,13 +1413,13 @@
|
|
DESTINATION ${CMAKE_INSTALL_BINDIR} RENAME djpeg${EXE})
|
|
install(PROGRAMS ${DIR}/jpegtran-static${EXE}
|
|
DESTINATION ${CMAKE_INSTALL_BINDIR} RENAME jpegtran${EXE})
|
|
endif()
|
|
endif()
|
|
|
|
-install(TARGETS rdjpgcom wrjpgcom RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
|
|
+#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
|