From a9caf2eb92c508a05480311ab4a8c7d60b4e318e Mon Sep 17 00:00:00 2001 From: pouillot Date: Wed, 2 Feb 2011 22:34:35 +0000 Subject: [PATCH] Re #313 (Split Windows installer) Make SD installable anywhere git-svn-id: https://svn.code.sf.net/p/speed-dreams/code/trunk@3302 30fe4595-0a0c-4342-8851-515496e4dcbd Former-commit-id: 52537803d9ae0e0deb4eaa9b83091aaebb0fe9b3 Former-commit-id: d5dc56f7ccba30b2b0b7f3526ca4d10c359c6c2e --- cmake/macros.cmake | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/cmake/macros.cmake b/cmake/macros.cmake index 1fbccde4c..e88e668b6 100644 --- a/cmake/macros.cmake +++ b/cmake/macros.cmake @@ -28,7 +28,7 @@ ENDIF(NOT DEFINED IN_SOURCETREE) IF(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT) IF(WIN32) - SET(CMAKE_INSTALL_PREFIX "C:/Program files" CACHE PATH "Prefix prepended to install directories" FORCE) + SET(CMAKE_INSTALL_PREFIX "C:/Program files/speed-dreams-2" CACHE PATH "Prefix prepended to install directories" FORCE) ELSE() SET(CMAKE_INSTALL_PREFIX "/usr/local" CACHE PATH "Prefix prepended to install directories" FORCE) ENDIF() @@ -76,10 +76,10 @@ IF(IN_SOURCETREE) SET(_DEFLIBDIR "lib64") ENDIF() IF(WIN32) - SET(SD_BINDIR speed-dreams-2/bin CACHE PATH "Place where the executables should go") - SET(SD_DATADIR speed-dreams-2/data CACHE PATH "Place where all the static data files should go") - SET(SD_LIBDIR speed-dreams-2/${_DEFLIBDIR} CACHE PATH "Place where the libraries should go") - SET(SD_INCLUDEDIR speed-dreams-2/include CACHE PATH "Place where the include files should go") + SET(SD_BINDIR bin CACHE PATH "Place where the executables should go") + SET(SD_DATADIR data CACHE PATH "Place where all the static data files should go") + SET(SD_LIBDIR ${_DEFLIBDIR} CACHE PATH "Place where the libraries should go") + SET(SD_INCLUDEDIR include CACHE PATH "Place where the include files should go") ELSE(WIN32) #UNIX SET(SD_BINDIR games CACHE PATH "Place where the executables should go") SET(SD_DATADIR share/games/speed-dreams-2 CACHE PATH "Place where all the static data files should go")