Skip to content

Commit

Permalink
Set windows install dir to C-Dogs SDL (fixes #96)
Browse files Browse the repository at this point in the history
This removes version number from path, so
that old version can be detected and
uninstalled during installation.
  • Loading branch information
cxong committed Jun 23, 2013
1 parent 2d199b7 commit 5f1fd4b
Showing 1 changed file with 4 additions and 3 deletions.
7 changes: 4 additions & 3 deletions src/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -91,10 +91,10 @@ set(CDOGS_DATA_DIR "")
set(CDOGS_CFG_DIR ".cdogs/")
IF(MSVC)
SET(SOURCE_DIRECTORY "${CMAKE_BINARY_DIR}")
SET(OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/cdogs-sdl_${VERSION}")
SET(OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/cdogs-sdl")
ELSE()
SET(SOURCE_DIRECTORY "..")
SET(OUTPUT_DIRECTORY "../cdogs-sdl_${VERSION}")
SET(OUTPUT_DIRECTORY "../cdogs-sdl")
ENDIF()
# TODO: fix workaround due to path difference
IF(UNIX)
Expand Down Expand Up @@ -179,10 +179,11 @@ SET(CPACK_PACKAGE_VERSION_MAJOR ${VERSION_MAJOR})
SET(CPACK_PACKAGE_VERSION_MINOR ${VERSION_MINOR})
SET(CPACK_PACKAGE_VERSION_PATCH ${VERSION_PATCH})
SET(CPACK_PACKAGE_EXECUTABLES "..\\\\cdogs-sdl;C-Dogs SDL")
SET(CPACK_RESOURCE_FILE_LICENSE ${SOURCE_DIRECTORY}/doc/COPYING.GPL)
IF(MSVC)
SET(CPACK_GENERATOR NSIS)
SET(CPACK_RESOURCE_FILE_LICENSE ${SOURCE_DIRECTORY}/doc/COPYING.GPL)
SET(CPACK_NSIS_ENABLE_UNINSTALL_BEFORE_INSTALL ON)
set(CPACK_PACKAGE_INSTALL_DIRECTORY "C-Dogs SDL")
SET(CPACK_NSIS_MUI_ICON ${SOURCE_DIRECTORY}/cdogs-icon.ico)
SET(CPACK_CREATE_DESKTOP_LINKS cdogs-sdl)
SET(CPACK_NSIS_MUI_FINISHPAGE_RUN ..\\\\cdogs-sdl.exe)
Expand Down

0 comments on commit 5f1fd4b

Please sign in to comment.