From 58635a112c2abdbeba6b2bc4e6d7e458b4201969 Mon Sep 17 00:00:00 2001 From: kervala Date: Wed, 8 Sep 2010 09:31:00 +0200 Subject: [PATCH] Fixed: Added missing RYZOM_*_PREFIX --- code/CMakeModules/nel.cmake | 57 +++++++++++++++++++++++++++++++++++++ code/ryzom/CMakeLists.txt | 2 ++ 2 files changed, 59 insertions(+) diff --git a/code/CMakeModules/nel.cmake b/code/CMakeModules/nel.cmake index f01e91ca6..346067a57 100644 --- a/code/CMakeModules/nel.cmake +++ b/code/CMakeModules/nel.cmake @@ -388,3 +388,60 @@ MACRO(NL_SETUP_PREFIX_PATHS) ENDIF(NOT NL_DRIVER_PREFIX) ENDMACRO(NL_SETUP_PREFIX_PATHS) + +MACRO(RYZOM_SETUP_PREFIX_PATHS) + ## Allow override of install_prefix path. + IF(NOT RYZOM_PREFIX) + IF(WIN32) + SET(RYZOM_PREFIX "." CACHE PATH "Installation path") + ELSE(WIN32) + SET(RYZOM_PREFIX "${CMAKE_INSTALL_PREFIX}" CACHE PATH "Installation path") + ENDIF(WIN32) + ENDIF(NOT RYZOM_PREFIX) + + ## Allow override of install_prefix/etc path. + IF(NOT RYZOM_ETC_PREFIX) + IF(WIN32) + SET(RYZOM_ETC_PREFIX "." CACHE PATH "Installation path for configurations") + ELSE(WIN32) + SET(RYZOM_ETC_PREFIX "${CMAKE_INSTALL_PREFIX}/etc/ryzom" CACHE PATH "Installation path for configurations") + ENDIF(WIN32) + ENDIF(NOT RYZOM_ETC_PREFIX) + + ## Allow override of install_prefix/share path. + IF(NOT RYZOM_SHARE_PREFIX) + IF(WIN32) + SET(RYZOM_SHARE_PREFIX "." CACHE PATH "Installation path for data.") + ELSE(WIN32) + SET(RYZOM_SHARE_PREFIX "${CMAKE_INSTALL_PREFIX}/share/ryzom" CACHE PATH "Installation path for data.") + ENDIF(WIN32) + ENDIF(NOT RYZOM_SHARE_PREFIX) + + ## Allow override of install_prefix/sbin path. + IF(NOT RYZOM_SBIN_PREFIX) + IF(WIN32) + SET(RYZOM_SBIN_PREFIX "." CACHE PATH "Installation path for admin tools and services.") + ELSE(WIN32) + SET(RYZOM_SBIN_PREFIX "${CMAKE_INSTALL_PREFIX}/sbin" CACHE PATH "Installation path for admin tools and services.") + ENDIF(WIN32) + ENDIF(NOT RYZOM_SBIN_PREFIX) + + ## Allow override of install_prefix/bin path. + IF(NOT RYZOM_BIN_PREFIX) + IF(WIN32) + SET(RYZOM_BIN_PREFIX "." CACHE PATH "Installation path for tools and applications.") + ELSE(WIN32) + SET(RYZOM_BIN_PREFIX "${CMAKE_INSTALL_PREFIX}/bin" CACHE PATH "Installation path for tools.") + ENDIF(WIN32) + ENDIF(NOT RYZOM_BIN_PREFIX) + + ## Allow override of install_prefix/games path. + IF(NOT RYZOM_GAMES_PREFIX) + IF(WIN32) + SET(RYZOM_GAMES_PREFIX "." CACHE PATH "Installation path for tools and applications.") + ELSE(WIN32) + SET(RYZOM_GAMES_PREFIX "${CMAKE_INSTALL_PREFIX}/games" CACHE PATH "Installation path for client.") + ENDIF(WIN32) + ENDIF(NOT RYZOM_GAMES_PREFIX) + +ENDMACRO(RYZOM_SETUP_PREFIX_PATHS) diff --git a/code/ryzom/CMakeLists.txt b/code/ryzom/CMakeLists.txt index 999e81ccc..8dcae73f9 100644 --- a/code/ryzom/CMakeLists.txt +++ b/code/ryzom/CMakeLists.txt @@ -18,6 +18,8 @@ ENDIF(NOT WIN32 AND NOT APPLE) INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/common/src ) INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/common ) +RYZOM_SETUP_PREFIX_PATHS() + IF(NOT WIN32) NL_CONFIGURE_CHECKS() ENDIF(NOT WIN32)