diff options
| author | dcommander <dcommander@3789f03b-4d11-0410-bbf8-ca57d06f2519> | 2011-02-18 23:49:42 +0000 |
|---|---|---|
| committer | dcommander <dcommander@3789f03b-4d11-0410-bbf8-ca57d06f2519> | 2011-02-18 23:49:42 +0000 |
| commit | 13bc8435f5abd7acce7e6d6aee7bad50fb797488 (patch) | |
| tree | 73b2e18f02bec6b773f77ae8741b37e7e53ca105 /branches | |
| parent | 72cf0a8c28d8e41742020ca79c4e2ada20b7d599 (diff) | |
Include libjpeg run-time programs and jpgtest in installer; Move documentation in SDK distribution packages into doc\ subdirectory
git-svn-id: https://libjpeg-turbo.svn.sourceforge.net/svnroot/libjpeg-turbo@407 3789f03b-4d11-0410-bbf8-ca57d06f2519
Diffstat (limited to 'branches')
| -rw-r--r-- | branches/1.1.x/CMakeLists.txt | 2 | ||||
| -rwxr-xr-x | branches/1.1.x/release/libjpeg-turbo.nsi.in | 27 |
2 files changed, 22 insertions, 7 deletions
diff --git a/branches/1.1.x/CMakeLists.txt b/branches/1.1.x/CMakeLists.txt index aa6871d..0c1d1b9 100644 --- a/branches/1.1.x/CMakeLists.txt +++ b/branches/1.1.x/CMakeLists.txt @@ -330,7 +330,7 @@ add_custom_target(installer DEPENDS jpeg jpeg-static turbojpeg turbojpeg-static SOURCES libjpeg-turbo.nsi) -install(TARGETS jpeg-static turbojpeg turbojpeg-static rdjpgcom wrjpgcom +install(TARGETS jpeg-static turbojpeg turbojpeg-static rdjpgcom wrjpgcom jpgtest ARCHIVE DESTINATION lib LIBRARY DESTINATION lib RUNTIME DESTINATION bin diff --git a/branches/1.1.x/release/libjpeg-turbo.nsi.in b/branches/1.1.x/release/libjpeg-turbo.nsi.in index 39b85d2..de71153 100755 --- a/branches/1.1.x/release/libjpeg-turbo.nsi.in +++ b/branches/1.1.x/release/libjpeg-turbo.nsi.in @@ -45,6 +45,12 @@ Section "@CMAKE_PROJECT_NAME@ SDK for @INST_PLATFORM@ (required)" !else File "@CMAKE_BINARY_DIR@\sharedlib\${BUILDDIR}jpeg@DLL_VERSION@.dll" !endif + File "@CMAKE_BINARY_DIR@\sharedlib\cjpeg.exe" + File "@CMAKE_BINARY_DIR@\sharedlib\djpeg.exe" + File "@CMAKE_BINARY_DIR@\sharedlib\jpegtran.exe" + File "@CMAKE_BINARY_DIR@\jpgtest.exe" + File "@CMAKE_BINARY_DIR@\rdjpgcom.exe" + File "@CMAKE_BINARY_DIR@\wrjpgcom.exe" SetOutPath $INSTDIR\lib !ifdef GCC File "@CMAKE_BINARY_DIR@\libturbojpeg.dll.a" @@ -63,12 +69,13 @@ Section "@CMAKE_PROJECT_NAME@ SDK for @INST_PLATFORM@ (required)" File "@CMAKE_SOURCE_DIR@\jmorecfg.h" File "@CMAKE_SOURCE_DIR@\jpeglib.h" File "@CMAKE_SOURCE_DIR@\turbojpeg.h" - SetOutPath $INSTDIR + SetOutPath $INSTDIR\doc File "@CMAKE_SOURCE_DIR@\README" File "@CMAKE_SOURCE_DIR@\README-turbo.txt" File "@CMAKE_SOURCE_DIR@\libjpeg.txt" File "@CMAKE_SOURCE_DIR@\LGPL.txt" File "@CMAKE_SOURCE_DIR@\LICENSE.txt" + File "@CMAKE_SOURCE_DIR@\usage.txt" WriteRegStr HKLM "SOFTWARE\@INST_NAME@ @VERSION@" "Install_Dir" "$INSTDIR" @@ -106,20 +113,28 @@ Section "Uninstall" Delete $INSTDIR\lib\turbojpeg.lib Delete $INSTDIR\lib\turbojpeg-static.lib !endif + Delete $INSTDIR\bin\cjpeg.exe + Delete $INSTDIR\bin\djpeg.exe + Delete $INSTDIR\bin\jpegtran.exe + Delete $INSTDIR\bin\jpgtest.exe + Delete $INSTDIR\bin\rdjpgcom.exe + Delete $INSTDIR\bin\wrjpgcom.exe Delete $INSTDIR\include\jconfig.h" Delete $INSTDIR\include\jerror.h" Delete $INSTDIR\include\jmorecfg.h" Delete $INSTDIR\include\jpeglib.h" Delete $INSTDIR\include\turbojpeg.h" Delete $INSTDIR\uninstall_@VERSION@.exe - Delete $INSTDIR\README - Delete $INSTDIR\README-turbo.txt - Delete $INSTDIR\libjpeg.txt - Delete $INSTDIR\LGPL.txt - Delete $INSTDIR\LICENSE.txt + Delete $INSTDIR\doc\README + Delete $INSTDIR\doc\README-turbo.txt + Delete $INSTDIR\doc\libjpeg.txt + Delete $INSTDIR\doc\LGPL.txt + Delete $INSTDIR\doc\LICENSE.txt + Delete $INSTDIR\doc\usage.txt RMDir "$INSTDIR\include" RMDir "$INSTDIR\lib" + RMDir "$INSTDIR\doc" RMDir "$INSTDIR\bin" RMDir "$INSTDIR" |