Changed: Minor changes

This commit is contained in:
kervala 2015-11-29 14:12:55 +01:00
parent 4ca1b40b6b
commit 6898434de6
2 changed files with 15 additions and 18 deletions

View file

@ -33,9 +33,9 @@ IF(COMMAND cmake_policy)
cmake_policy(SET CMP0005 OLD) cmake_policy(SET CMP0005 OLD)
ENDIF(COMMAND cmake_policy) ENDIF(COMMAND cmake_policy)
INCLUDE(${CMAKE_CURRENT_SOURCE_DIR}/CMakeModules/nel.cmake) INCLUDE(nel)
INCLUDE(${CMAKE_CURRENT_SOURCE_DIR}/CMakeModules/ConfigureChecks.cmake) INCLUDE(ConfigureChecks)
INCLUDE(${CMAKE_CURRENT_SOURCE_DIR}/CMakeModules/CheckDepends.cmake) INCLUDE(CheckDepends)
INCLUDE(${CMAKE_ROOT}/Modules/Documentation.cmake OPTIONAL) INCLUDE(${CMAKE_ROOT}/Modules/Documentation.cmake OPTIONAL)
# Force out of source builds. # Force out of source builds.

View file

@ -1,21 +1,18 @@
# Need clientsheets lib for sheets packer tool # Need clientsheets lib for sheets packer tool
ADD_SUBDIRECTORY(src) ADD_SUBDIRECTORY(src)
IF(WITH_RYZOM_CLIENT) IF(WITH_RYZOM_CLIENT)
#ADD_SUBDIRECTORY(data)
#ADD_SUBDIRECTORY(patcher)
#ADD_SUBDIRECTORY(data) IF(UNIX AND NOT APPLE)
#ADD_SUBDIRECTORY(patcher) ADD_SUBDIRECTORY(unix)
ENDIF()
IF(UNIX AND NOT APPLE) IF(RYZOM_ETC_PREFIX)
ADD_SUBDIRECTORY(unix) CONFIGURE_FILE(client_default.cfg.in "${CMAKE_CURRENT_BINARY_DIR}/client_default.cfg")
ENDIF(UNIX AND NOT APPLE) INSTALL(FILES "${CMAKE_CURRENT_BINARY_DIR}/client_default.cfg" DESTINATION ${RYZOM_ETC_PREFIX})
ELSE()
IF(RYZOM_ETC_PREFIX) INSTALL(FILES client_default.cfg DESTINATION etc/ryzom)
CONFIGURE_FILE(client_default.cfg.in "${CMAKE_CURRENT_BINARY_DIR}/client_default.cfg") ENDIF()
INSTALL(FILES "${CMAKE_CURRENT_BINARY_DIR}/client_default.cfg" DESTINATION ${RYZOM_ETC_PREFIX}) ENDIF()
ELSE(RYZOM_ETC_PREFIX)
INSTALL(FILES client_default.cfg DESTINATION etc/ryzom)
ENDIF(RYZOM_ETC_PREFIX)
ENDIF(WITH_RYZOM_CLIENT)