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

Removed unnecessarily repeated test expressions

Browse Source
This commit is contained in:
Morgan Hardwood 2020-02-25 10:06:35 +01:00
parent 0055d0705d
commit 326153859a
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
UpdateInfo.cmake
View File

@ -10,10 +10,10 @@ if(REL_INFO_FILE STREQUAL REL_INFO_FILE-NOTFOUND)
find_program(GIT_CMD git PATHS "/opt/local/bin" "/usr/local/bin" "/usr/bin") find_program(GIT_CMD git PATHS "/opt/local/bin" "/usr/local/bin" "/usr/bin")
find_program(GIT_CMD git) find_program(GIT_CMD git)
set(SHELL "/bin/bash") set(SHELL "/bin/bash")
else(WIN32) # Linux else() # Linux
find_program(GIT_CMD git) find_program(GIT_CMD git)
set(SHELL "/bin/bash") set(SHELL "/bin/bash")
endif(WIN32) endif()
# Fail if Git is not installed # Fail if Git is not installed
if(GIT_CMD STREQUAL GIT_CMD-NOTFOUND) if(GIT_CMD STREQUAL GIT_CMD-NOTFOUND)
@ -79,10 +79,9 @@ if(REL_INFO_FILE STREQUAL REL_INFO_FILE-NOTFOUND)
else() else()
message(STATUS "CACHE_NAME_SUFFIX is \"${CACHE_NAME_SUFFIX}\"") message(STATUS "CACHE_NAME_SUFFIX is \"${CACHE_NAME_SUFFIX}\"")
endif() endif()
else()
else(REL_INFO_FILE STREQUAL REL_INFO_FILE-NOTFOUND)
include("${PROJECT_SOURCE_DIR}/ReleaseInfo.cmake") include("${PROJECT_SOURCE_DIR}/ReleaseInfo.cmake")
endif(REL_INFO_FILE STREQUAL REL_INFO_FILE-NOTFOUND) endif()
if(WIN32) if(WIN32)
if(BIT_DEPTH EQUAL 4) if(BIT_DEPTH EQUAL 4)
@ -97,12 +96,12 @@ if(WIN32)
set(ARCHITECTURE_ALLOWED "x64 ia64") set(ARCHITECTURE_ALLOWED "x64 ia64")
# installing in 64 bits mode for all 64 bits processors, even for itanium architecture # installing in 64 bits mode for all 64 bits processors, even for itanium architecture
set(INSTALL_MODE "x64 ia64") set(INSTALL_MODE "x64 ia64")
endif(BIT_DEPTH EQUAL 4) endif()
# set part of the output archive name # set part of the output archive name
set(SYSTEM_NAME "WinVista") set(SYSTEM_NAME "WinVista")
configure_file("${PROJECT_SOURCE_DIR}/tools/win/InnoSetup/WindowsInnoSetup.iss.in" "${CMAKE_BINARY_DIR}/rtdata/WindowsInnoSetup.iss") configure_file("${PROJECT_SOURCE_DIR}/tools/win/InnoSetup/WindowsInnoSetup.iss.in" "${CMAKE_BINARY_DIR}/rtdata/WindowsInnoSetup.iss")
endif(WIN32) endif()
# build version.h from template # build version.h from template
configure_file("${PROJECT_SOURCE_DIR}/rtgui/version.h.in" "${CMAKE_BINARY_DIR}/rtgui/version.h") configure_file("${PROJECT_SOURCE_DIR}/rtgui/version.h.in" "${CMAKE_BINARY_DIR}/rtgui/version.h")