From 57d23c74ee73201efc0f20da5e51832c823dd09c Mon Sep 17 00:00:00 2001 From: Ivan Savenko Date: Mon, 25 Feb 2013 19:17:36 +0000 Subject: [PATCH] patches from qdii --- CMakeLists.txt | 12 +++++++++--- client/icons/vcmiclient.desktop | 2 +- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index f3b40d6b7..16bc98f8e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -89,9 +89,15 @@ else() # includes lib path which determines where to install shared libraries (either /lib or /lib64) include(GNUInstallDirs) - set(BIN_DIR "bin" CACHE STRING "Where to install binaries") - set(LIB_DIR "${CMAKE_INSTALL_LIBDIR}/vcmi" CACHE STRING "Where to install main library") - set(DATA_DIR "share/vcmi" CACHE STRING "Where to install data files") + if (NOT BIN_DIR) + set(BIN_DIR "bin" CACHE STRING "Where to install binaries") + endif() + if (NOT LIB_DIR) + set(LIB_DIR "${CMAKE_INSTALL_LIBDIR}/vcmi" CACHE STRING "Where to install main library") + endif() + if (NOT DATA_DIR) + set(DATA_DIR "share/vcmi" CACHE STRING "Where to install data files") + endif() endif() set (AI_LIB_DIR "${LIB_DIR}/AI") diff --git a/client/icons/vcmiclient.desktop b/client/icons/vcmiclient.desktop index 3adeda60b..0c47d546d 100644 --- a/client/icons/vcmiclient.desktop +++ b/client/icons/vcmiclient.desktop @@ -6,4 +6,4 @@ Comment=Open engine for Heroes of Might and Magic 3 Icon=vcmiclient Exec=vcmiclient Categories=Game;StrategyGame; -Version=0.91 +Version=1.0