Skip to content

Commit

Permalink
Fix an issue whereby the installer .exe was ending up in the wrong di…
Browse files Browse the repository at this point in the history
…rectory.

git-svn-id: svn+ssh://svn.code.sf.net/p/turbovnc/code/trunk@2048 799e4f7b-5fd2-41f6-823c-2ecc41bc7f0b
  • Loading branch information
dcommander committed Jul 31, 2012
1 parent d820e61 commit 9eeb4b5
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions cmakescripts/BuildPackages.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -45,23 +45,23 @@ if(WIN32)

if(BITS EQUAL 64)
set(INST_NAME ${CMAKE_PROJECT_NAME}64-${VERSION})
set(WIN64DEF -DWIN64)
set(INST_DEFS -DWIN64)
else()
set(INST_NAME ${CMAKE_PROJECT_NAME}-${VERSION})
set(INST_NAME ${CMAKE_PROJECT_NAME}-${VERSION})
endif()

if(MSVC_IDE)
set(INSTALLERDIR "$(OutDir)")
set(BUILDDIRDEF ${INST_DEFS} "-DBUILDDIR=${INSTALLERDIR}\\")
set(INSTALLERDIR ${CMAKE_CFG_INTDIR})
set(INST_DEFS ${INST_DEFS} "-DBUILDDIR=${INSTALLERDIR}\\")
else()
set(INSTALLERDIR .)
set(BUILDDIRDEF ${INST_DEFS} "-DBUILDDIR=")
set(INST_DEFS ${INST_DEFS} "-DBUILDDIR=")
endif()

configure_file(release/@CMAKE_PROJECT_NAME@.iss.in pkgscripts/@CMAKE_PROJECT_NAME@.iss)

add_custom_target(installer
iscc -o${INSTALLERDIR} ${WIN64DEF} ${BUILDDIRDEF} -F${INST_NAME}
iscc -o${INSTALLERDIR} ${INST_DEFS} -F${INST_NAME}
pkgscripts/@CMAKE_PROJECT_NAME@.iss
DEPENDS vncviewer putty
SOURCES pkgscripts/@CMAKE_PROJECT_NAME@.iss)
Expand Down

0 comments on commit 9eeb4b5

Please sign in to comment.