mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-23 06:59:02 +08:00
127 lines
5.0 KiB
Diff
127 lines
5.0 KiB
Diff
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
index 51f4714..9ca3463 100644
|
|
--- a/CMakeLists.txt
|
|
+++ b/CMakeLists.txt
|
|
@@ -1370,21 +1370,28 @@ endif()
|
|
|
|
set(EXE ${CMAKE_EXECUTABLE_SUFFIX})
|
|
|
|
+if(CMAKE_BUILD_TYPE STREQUAL "Debug")
|
|
+ set(REAL_BUILDS_PATH "Debug/")
|
|
+else()
|
|
+ set(REAL_BUILDS_PATH "Release/")
|
|
+endif()
|
|
+
|
|
if(WITH_TURBOJPEG)
|
|
if(ENABLE_SHARED)
|
|
install(TARGETS turbojpeg tjbench
|
|
- ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
|
|
- LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
|
|
- RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
|
|
+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}/mozjpeg
|
|
+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/mozjpeg
|
|
+ RUNTIME DESTINATION tools/mozjpeg)
|
|
if(NOT CMAKE_VERSION VERSION_LESS "3.1" AND MSVC AND
|
|
CMAKE_C_LINKER_SUPPORTS_PDB)
|
|
install(FILES "$<TARGET_PDB_FILE:turbojpeg>"
|
|
- DESTINATION ${CMAKE_INSTALL_BINDIR} OPTIONAL)
|
|
+ DESTINATION ${CMAKE_INSTALL_BINDIR}/mozjpeg OPTIONAL)
|
|
endif()
|
|
endif()
|
|
if(ENABLE_STATIC)
|
|
- install(TARGETS turbojpeg-static ARCHIVE
|
|
- DESTINATION ${CMAKE_INSTALL_LIBDIR})
|
|
+ install(TARGETS turbojpeg-static
|
|
+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/mozjpeg
|
|
+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}/mozjpeg)
|
|
if(NOT ENABLE_SHARED)
|
|
if(MSVC_IDE OR XCODE)
|
|
set(DIR "${CMAKE_CURRENT_BINARY_DIR}/\${CMAKE_INSTALL_CONFIG_NAME}")
|
|
@@ -1392,15 +1399,15 @@ if(WITH_TURBOJPEG)
|
|
set(DIR ${CMAKE_CURRENT_BINARY_DIR})
|
|
endif()
|
|
install(PROGRAMS ${DIR}/tjbench-static${EXE}
|
|
- DESTINATION ${CMAKE_INSTALL_BINDIR} RENAME tjbench${EXE})
|
|
+ DESTINATION tools/mozjpeg RENAME tjbench${EXE})
|
|
endif()
|
|
endif()
|
|
install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/turbojpeg.h
|
|
- DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
|
|
+ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/mozjpeg)
|
|
endif()
|
|
|
|
if(ENABLE_STATIC)
|
|
- install(TARGETS jpeg-static ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
|
|
+ install(TARGETS jpeg-static ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}/mozjpeg)
|
|
if(NOT ENABLE_SHARED)
|
|
if(MSVC_IDE OR XCODE)
|
|
set(DIR "${CMAKE_CURRENT_BINARY_DIR}/\${CMAKE_INSTALL_CONFIG_NAME}")
|
|
@@ -1408,15 +1415,15 @@ if(ENABLE_STATIC)
|
|
set(DIR ${CMAKE_CURRENT_BINARY_DIR})
|
|
endif()
|
|
install(PROGRAMS ${DIR}/cjpeg-static${EXE}
|
|
- DESTINATION ${CMAKE_INSTALL_BINDIR} RENAME cjpeg${EXE})
|
|
+ DESTINATION tools/mozjpeg RENAME cjpeg${EXE})
|
|
install(PROGRAMS ${DIR}/djpeg-static${EXE}
|
|
- DESTINATION ${CMAKE_INSTALL_BINDIR} RENAME djpeg${EXE})
|
|
+ DESTINATION tools/mozjpeg RENAME djpeg${EXE})
|
|
install(PROGRAMS ${DIR}/jpegtran-static${EXE}
|
|
- DESTINATION ${CMAKE_INSTALL_BINDIR} RENAME jpegtran${EXE})
|
|
+ DESTINATION tools/mozjpeg RENAME jpegtran${EXE})
|
|
endif()
|
|
endif()
|
|
|
|
-install(TARGETS rdjpgcom wrjpgcom RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
|
|
+install(TARGETS rdjpgcom wrjpgcom RUNTIME DESTINATION tools/mozjpeg)
|
|
|
|
install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/README.ijg
|
|
${CMAKE_CURRENT_SOURCE_DIR}/README.md ${CMAKE_CURRENT_SOURCE_DIR}/example.txt
|
|
@@ -1424,10 +1431,10 @@ install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/README.ijg
|
|
${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})
|
|
+ ${CMAKE_CURRENT_SOURCE_DIR}/LICENSE.md DESTINATION share/mozjpeg)
|
|
if(WITH_JAVA)
|
|
install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/java/TJExample.java
|
|
- DESTINATION ${CMAKE_INSTALL_DOCDIR})
|
|
+ DESTINATION share/mozjpeg)
|
|
endif()
|
|
|
|
if(UNIX OR MINGW)
|
|
@@ -1439,12 +1446,12 @@ if(UNIX OR MINGW)
|
|
endif()
|
|
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/pkgscripts/libjpeg.pc
|
|
${CMAKE_CURRENT_BINARY_DIR}/pkgscripts/libturbojpeg.pc
|
|
- DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
|
|
+ DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig/mozjpeg)
|
|
|
|
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
|
|
- DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
|
|
+ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/mozjpeg)
|
|
|
|
include(cmakescripts/BuildPackages.cmake)
|
|
|
|
diff --git a/sharedlib/CMakeLists.txt b/sharedlib/CMakeLists.txt
|
|
index f0a7d87..1e82349 100644
|
|
--- a/sharedlib/CMakeLists.txt
|
|
+++ b/sharedlib/CMakeLists.txt
|
|
@@ -92,11 +92,11 @@ add_executable(jcstest ../jcstest.c)
|
|
target_link_libraries(jcstest jpeg)
|
|
|
|
install(TARGETS jpeg cjpeg djpeg jpegtran
|
|
- ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
|
|
- LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
|
|
- RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
|
|
+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}/mozjpeg
|
|
+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/mozjpeg
|
|
+ RUNTIME DESTINATION tools/mozjpeg)
|
|
if(NOT CMAKE_VERSION VERSION_LESS "3.1" AND MSVC AND
|
|
CMAKE_C_LINKER_SUPPORTS_PDB)
|
|
install(FILES "$<TARGET_PDB_FILE:jpeg>"
|
|
- DESTINATION ${CMAKE_INSTALL_BINDIR} OPTIONAL)
|
|
+ DESTINATION ${CMAKE_INSTALL_BINDIR}/mozjpeg OPTIONAL)
|
|
endif()
|