# HG changeset patch # User displacer # Date 1164317602 0 # Node ID 53f46353d029e6685bba7a737137708c4958ff72 # Parent bd06dcfa5bff1bf74cfb76290e9b73a2b952a5a6 one else fix diff -r bd06dcfa5bff -r 53f46353d029 CMakeLists.txt --- a/CMakeLists.txt Thu Nov 23 21:03:11 2006 +0000 +++ b/CMakeLists.txt Thu Nov 23 21:33:22 2006 +0000 @@ -2,11 +2,11 @@ cmake_minimum_required(VERSION 2.4.0) -if(DEFINED ${DATA_INSTALL_DIR}) +if(DEFINED DATA_INSTALL_DIR) set(SHAREPATH ${DATA_INSTALL_DIR}/hedgewars/) -else(DEFINED ${DATA_INSTALL_DIR}) +else(DEFINED DATA_INSTALL_DIR) set(SHAREPATH share/hedgewars/) -endif(DEFINED ${DATA_INSTALL_DIR}) +endif(DEFINED DATA_INSTALL_DIR) set(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin) add_subdirectory(bin) diff -r bd06dcfa5bff -r 53f46353d029 QTfrontend/CMakeLists.txt --- a/QTfrontend/CMakeLists.txt Thu Nov 23 21:03:11 2006 +0000 +++ b/QTfrontend/CMakeLists.txt Thu Nov 23 21:33:22 2006 +0000 @@ -8,11 +8,11 @@ set(HEDGEWARS_BINDIR ".") else(WIN32 AND NOT UNIX) set(HEDGEWARS_BINDIR ${CMAKE_INSTALL_PREFIX}) - if(DEFINED ${DATA_INSTALL_DIR}) + if(DEFINED DATA_INSTALL_DIR) set(HEDGEWARS_DATADIR ${DATA_INSTALL_DIR}) - else(DEFINED ${DATA_INSTALL_DIR}) + else(DEFINED DATA_INSTALL_DIR) set(HEDGEWARS_DATADIR ${CMAKE_INSTALL_PREFIX}/share/) - endif(DEFINED ${DATA_INSTALL_DIR}) + endif(DEFINED DATA_INSTALL_DIR) endif(WIN32 AND NOT UNIX) configure_file(${hedgewars_SOURCE_DIR}/QTfrontend/main.cpp.in