mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-28 19:25:27 +08:00
7f13cec4e3
* [jemalloc]Fix dll generated when generating static library * Revert "[jemalloc]Fix dll generated when generating static library" This reverts commit a833bf5593be181e065af097732c78cb810888fd. * [mozjpeg]1.Fix installation files to the wrong directory. 2.Change how dynamic and static library built macros are used
88 lines
3.4 KiB
Diff
88 lines
3.4 KiB
Diff
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
index ac0ebdb..483bf0f 100644
|
|
--- a/CMakeLists.txt
|
|
+++ b/CMakeLists.txt
|
|
@@ -875,43 +875,51 @@ add_custom_target(installer
|
|
cjpeg djpeg jpegtran tjbench ${JAVA_DEPEND}
|
|
SOURCES mozjpeg.nsi)
|
|
|
|
+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 lib
|
|
- LIBRARY DESTINATION lib
|
|
- RUNTIME DESTINATION bin)
|
|
+ ARCHIVE DESTINATION lib/mozjpeg
|
|
+ LIBRARY DESTINATION lib/mozjpeg
|
|
+ RUNTIME DESTINATION tools/mozjpeg)
|
|
endif()
|
|
if(ENABLE_STATIC)
|
|
- install(TARGETS turbojpeg-static ARCHIVE DESTINATION lib)
|
|
+ install(TARGETS turbojpeg-static
|
|
+ LIBRARY DESTINATION lib/mozjpeg
|
|
+ ARCHIVE DESTINATION lib/mozjpeg)
|
|
if(NOT ENABLE_SHARED)
|
|
- install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/tjbench-static.exe
|
|
- DESTINATION bin RENAME tjbench.exe)
|
|
+ install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/${REAL_BUILDS_PATH}mozjpeg/tjbench-static.exe
|
|
+ DESTINATION tools/mozjpeg RENAME tjbench.exe)
|
|
endif()
|
|
endif()
|
|
- install(FILES ${CMAKE_SOURCE_DIR}/turbojpeg.h DESTINATION include)
|
|
+ install(FILES ${CMAKE_SOURCE_DIR}/turbojpeg.h DESTINATION include/mozjpeg)
|
|
endif()
|
|
|
|
if(ENABLE_STATIC)
|
|
- install(TARGETS jpeg-static ARCHIVE DESTINATION lib)
|
|
+ install(TARGETS jpeg-static ARCHIVE DESTINATION lib/mozjpeg)
|
|
if(NOT ENABLE_SHARED)
|
|
- install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/cjpeg-static.exe
|
|
- DESTINATION bin RENAME cjpeg.exe)
|
|
- install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/djpeg-static.exe
|
|
- DESTINATION bin RENAME djpeg.exe)
|
|
- install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/jpegtran-static.exe
|
|
- DESTINATION bin RENAME jpegtran.exe)
|
|
+ install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/${REAL_BUILDS_PATH}mozjpeg/cjpeg-static.exe
|
|
+ DESTINATION tools/mozjpeg RENAME cjpeg.exe)
|
|
+ install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/${REAL_BUILDS_PATH}mozjpeg/djpeg-static.exe
|
|
+ DESTINATION tools/mozjpeg RENAME djpeg.exe)
|
|
+ install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/${REAL_BUILDS_PATH}mozjpeg/jpegtran-static.exe
|
|
+ DESTINATION tools/mozjpeg RENAME jpegtran.exe)
|
|
endif()
|
|
endif()
|
|
|
|
-install(TARGETS rdjpgcom wrjpgcom RUNTIME DESTINATION bin)
|
|
+install(TARGETS rdjpgcom wrjpgcom RUNTIME DESTINATION tools/mozjpeg)
|
|
|
|
install(FILES ${CMAKE_SOURCE_DIR}/README.ijg ${CMAKE_SOURCE_DIR}/README-mozilla.txt
|
|
${CMAKE_SOURCE_DIR}/example.c ${CMAKE_SOURCE_DIR}/libjpeg.txt
|
|
${CMAKE_SOURCE_DIR}/structure.txt ${CMAKE_SOURCE_DIR}/usage.txt
|
|
${CMAKE_SOURCE_DIR}/wizard.txt
|
|
- DESTINATION doc)
|
|
+ DESTINATION share/mozjpeg)
|
|
|
|
install(FILES ${CMAKE_BINARY_DIR}/jconfig.h ${CMAKE_SOURCE_DIR}/jerror.h
|
|
${CMAKE_SOURCE_DIR}/jmorecfg.h ${CMAKE_SOURCE_DIR}/jpeglib.h
|
|
- DESTINATION include)
|
|
+ DESTINATION include/mozjpeg)
|
|
diff --git a/sharedlib/CMakeLists.txt b/sharedlib/CMakeLists.txt
|
|
index 268cc14..d067d2a 100644
|
|
--- a/sharedlib/CMakeLists.txt
|
|
+++ b/sharedlib/CMakeLists.txt
|
|
@@ -68,6 +68,6 @@ add_executable(jcstest ../jcstest.c)
|
|
target_link_libraries(jcstest jpeg)
|
|
|
|
install(TARGETS jpeg cjpeg djpeg jpegtran
|
|
- ARCHIVE DESTINATION lib
|
|
- LIBRARY DESTINATION lib
|
|
- RUNTIME DESTINATION bin)
|
|
+ ARCHIVE DESTINATION lib/mozjpeg
|
|
+ LIBRARY DESTINATION lib/mozjpeg
|
|
+ RUNTIME DESTINATION tools/mozjpeg)
|