ryan/mozjpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

We want to keep the same name for the install directory, even though the installer name has changed

Browse Source 
git-svn-id: svn+ssh://svn.code.sf.net/p/libjpeg-turbo/code/branches/1.1.x@535 632fc199-4ca6-4c93-a231-07263d6284db
This commit is contained in:
DRC
2011-03-22 06:49:31 +00:00
parent 539b288780
commit 1c87e45cff
2 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
CMakeLists.txt
View File

@@ -301,20 +301,21 @@ add_test(jpegtran-static-crop-cmp ${CMAKE_COMMAND} -E compare_files ${CMAKE_SOUR
# Installer # Installer
# #
set(INST_NAME ${CMAKE_PROJECT_NAME}-${VERSION})
if(MSVC) if(MSVC)
set(INST_PLATFORM "Visual C++") set(INST_PLATFORM "Visual C++")
set(INST_NAME ${INST_NAME}-vc) set(INST_NAME ${CMAKE_PROJECT_NAME}-${VERSION}-vc)
set(INST_DIR ${CMAKE_PROJECT_NAME})
elseif(MINGW) elseif(MINGW)
set(INST_PLATFORM GCC) set(INST_PLATFORM GCC)
set(INST_NAME ${INST_NAME}-gcc) set(INST_NAME ${CMAKE_PROJECT_NAME}-${VERSION}-gcc)
set(INST_DIR ${CMAKE_PROJECT_NAME}-gcc)
set(INST_DEFS -DGCC) set(INST_DEFS -DGCC)
endif() endif()
if(64BIT) if(64BIT)
set(INST_PLATFORM "${INST_PLATFORM} 64-bit") set(INST_PLATFORM "${INST_PLATFORM} 64-bit")
set(INST_NAME ${INST_NAME}64) set(INST_NAME ${INST_NAME}64)
set(INST_DIR ${INST_DIR}64)
set(INST_DEFS ${INST_DEFS} -DWIN64) set(INST_DEFS ${INST_DEFS} -DWIN64)
endif() endif()

16
release/libjpeg-turbo.nsi.in
View File

@@ -1,7 +1,7 @@
!include x64.nsh !include x64.nsh
Name "@CMAKE_PROJECT_NAME@ SDK for @INST_PLATFORM@" Name "@CMAKE_PROJECT_NAME@ SDK for @INST_PLATFORM@"
OutFile "@CMAKE_BINARY_DIR@\${BUILDDIR}@INST_NAME@.exe" OutFile "@CMAKE_BINARY_DIR@\${BUILDDIR}@INST_NAME@.exe"
InstallDir c:\@INST_NAME@ InstallDir c:\@INST_DIR@
SetCompressor bzip2 SetCompressor bzip2
@@ -77,12 +77,12 @@ Section "@CMAKE_PROJECT_NAME@ SDK for @INST_PLATFORM@ (required)"
File "@CMAKE_SOURCE_DIR@\LICENSE.txt" File "@CMAKE_SOURCE_DIR@\LICENSE.txt"
File "@CMAKE_SOURCE_DIR@\usage.txt" File "@CMAKE_SOURCE_DIR@\usage.txt"
WriteRegStr HKLM "SOFTWARE\@INST_NAME@ @VERSION@" "Install_Dir" "$INSTDIR" WriteRegStr HKLM "SOFTWARE\@INST_DIR@ @VERSION@" "Install_Dir" "$INSTDIR"
WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\@INST_NAME@ @VERSION@" "DisplayName" "@CMAKE_PROJECT_NAME@ SDK v@VERSION@ for @INST_PLATFORM@" WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\@INST_DIR@ @VERSION@" "DisplayName" "@CMAKE_PROJECT_NAME@ SDK v@VERSION@ for @INST_PLATFORM@"
WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\@INST_NAME@ @VERSION@" "UninstallString" '"$INSTDIR\uninstall_@VERSION@.exe"' WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\@INST_DIR@ @VERSION@" "UninstallString" '"$INSTDIR\uninstall_@VERSION@.exe"'
WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\@INST_NAME@ @VERSION@" "NoModify" 1 WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\@INST_DIR@ @VERSION@" "NoModify" 1
WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\@INST_NAME@ @VERSION@" "NoRepair" 1 WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\@INST_DIR@ @VERSION@" "NoRepair" 1
WriteUninstaller "uninstall_@VERSION@.exe" WriteUninstaller "uninstall_@VERSION@.exe"
SectionEnd SectionEnd
@@ -95,8 +95,8 @@ Section "Uninstall"
SetShellVarContext all SetShellVarContext all
DeleteRegKey HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\@INST_NAME@ @VERSION@" DeleteRegKey HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\@INST_DIR@ @VERSION@"
DeleteRegKey HKLM "SOFTWARE\@INST_NAME@ @VERSION@" DeleteRegKey HKLM "SOFTWARE\@INST_DIR@ @VERSION@"
!ifdef GCC !ifdef GCC
Delete $INSTDIR\bin\libjpeg-@DLL_VERSION@.dll Delete $INSTDIR\bin\libjpeg-@DLL_VERSION@.dll