liz/rawTherapee
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Issue 1904: "Setup script for Windows", removing the restriction preventing a 32 bits build to be installed on a 64 bit (WinXP) system

Browse Source
This commit is contained in:
natureh 510
2013-07-29 23:00:33 +02:00
parent 5720aa6621
commit 4c35ea83d0
2 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
rtdata/CMakeLists.txt
View File

@@ -30,10 +30,16 @@ if (WIN32)
if (CMAKE_SIZEOF_VOID_P EQUAL 4) if (CMAKE_SIZEOF_VOID_P EQUAL 4)
set(BUILD_BIT_DEPTH 32) set(BUILD_BIT_DEPTH 32)
set(ARCHITECTURE_ALLOWED x86) # 32 bits builds has to be installable on 64 bits system, to support WinXP/64.
set(ARCHITECTURE_ALLOWED "x86 x64 ia64")
# installing in 32 bits mode even on 64 bits OS and architecture
set(INSTALL_MODE "")
elseif (CMAKE_SIZEOF_VOID_P EQUAL 8) elseif (CMAKE_SIZEOF_VOID_P EQUAL 8)
set(BUILD_BIT_DEPTH 64) set(BUILD_BIT_DEPTH 64)
set(ARCHITECTURE_ALLOWED x64) # Restricting the 64 bits builds to 64 bits systems only
set(ARCHITECTURE_ALLOWED "x64 ia64")
# installing in 64 bits mode for all 64 bits processors, even for itanium architecture
set(INSTALL_MODE "x64 ia64")
endif (CMAKE_SIZEOF_VOID_P EQUAL 4) endif (CMAKE_SIZEOF_VOID_P EQUAL 4)
configure_file ("${CMAKE_CURRENT_SOURCE_DIR}/win/InnoSetup/WindowsInnoSetup.iss.in" "${CMAKE_CURRENT_BINARY_DIR}/WindowsInnoSetup.iss") configure_file ("${CMAKE_CURRENT_SOURCE_DIR}/win/InnoSetup/WindowsInnoSetup.iss.in" "${CMAKE_CURRENT_BINARY_DIR}/WindowsInnoSetup.iss")
install (FILES "${CMAKE_CURRENT_BINARY_DIR}/WindowsInnoSetup.iss" DESTINATION ${BINDIR}) install (FILES "${CMAKE_CURRENT_BINARY_DIR}/WindowsInnoSetup.iss" DESTINATION ${BINDIR})

3
rtdata/win/InnoSetup/WindowsInnoSetup.iss.in
View File

@@ -32,6 +32,7 @@
#define MySourceBasePath "${PROJECT_SOURCE_DIR}" #define MySourceBasePath "${PROJECT_SOURCE_DIR}"
#define MyBitDepth "${BUILD_BIT_DEPTH}" #define MyBitDepth "${BUILD_BIT_DEPTH}"
#define MyTargetArchitecture "${ARCHITECTURE_ALLOWED}" #define MyTargetArchitecture "${ARCHITECTURE_ALLOWED}"
#define MyInstallMode "${INSTALL_MODE}"
[Setup] [Setup]
; NOTE: The value of AppId uniquely identifies this application. ; NOTE: The value of AppId uniquely identifies this application.
@@ -58,7 +59,7 @@ WizardImageBackColor=$2A2A2A
Compression=lzma Compression=lzma
SolidCompression=yes SolidCompression=yes
ArchitecturesAllowed={#MyTargetArchitecture} ArchitecturesAllowed={#MyTargetArchitecture}
ArchitecturesInstallIn64BitMode=x64 ArchitecturesInstallIn64BitMode={#MyInstallMode}
[Languages] [Languages]
Name: "english"; MessagesFile: "compiler:Default.isl" Name: "english"; MessagesFile: "compiler:Default.isl"