From ce519d6d34f4706c4a59321d514328566f2ee4fe Mon Sep 17 00:00:00 2001 From: kervala Date: Sun, 29 Nov 2015 14:12:55 +0100 Subject: [PATCH] Changed: Minor changes --HG-- branch : develop --- code/CMakeLists.txt | 6 +++--- code/ryzom/client/CMakeLists.txt | 27 ++++++++++++--------------- 2 files changed, 15 insertions(+), 18 deletions(-) diff --git a/code/CMakeLists.txt b/code/CMakeLists.txt index f3fabaad0..6c4b0bdc1 100644 --- a/code/CMakeLists.txt +++ b/code/CMakeLists.txt @@ -33,9 +33,9 @@ IF(COMMAND cmake_policy) cmake_policy(SET CMP0005 OLD) ENDIF(COMMAND cmake_policy) -INCLUDE(${CMAKE_CURRENT_SOURCE_DIR}/CMakeModules/nel.cmake) -INCLUDE(${CMAKE_CURRENT_SOURCE_DIR}/CMakeModules/ConfigureChecks.cmake) -INCLUDE(${CMAKE_CURRENT_SOURCE_DIR}/CMakeModules/CheckDepends.cmake) +INCLUDE(nel) +INCLUDE(ConfigureChecks) +INCLUDE(CheckDepends) INCLUDE(${CMAKE_ROOT}/Modules/Documentation.cmake OPTIONAL) # Force out of source builds. diff --git a/code/ryzom/client/CMakeLists.txt b/code/ryzom/client/CMakeLists.txt index 78cbbbd04..9431e9e49 100644 --- a/code/ryzom/client/CMakeLists.txt +++ b/code/ryzom/client/CMakeLists.txt @@ -1,21 +1,18 @@ - # Need clientsheets lib for sheets packer tool ADD_SUBDIRECTORY(src) IF(WITH_RYZOM_CLIENT) + #ADD_SUBDIRECTORY(data) + #ADD_SUBDIRECTORY(patcher) -#ADD_SUBDIRECTORY(data) -#ADD_SUBDIRECTORY(patcher) + IF(UNIX AND NOT APPLE) + ADD_SUBDIRECTORY(unix) + ENDIF() -IF(UNIX AND NOT APPLE) - ADD_SUBDIRECTORY(unix) -ENDIF(UNIX AND NOT APPLE) - -IF(RYZOM_ETC_PREFIX) - CONFIGURE_FILE(client_default.cfg.in "${CMAKE_CURRENT_BINARY_DIR}/client_default.cfg") - INSTALL(FILES "${CMAKE_CURRENT_BINARY_DIR}/client_default.cfg" DESTINATION ${RYZOM_ETC_PREFIX}) -ELSE(RYZOM_ETC_PREFIX) - INSTALL(FILES client_default.cfg DESTINATION etc/ryzom) -ENDIF(RYZOM_ETC_PREFIX) - -ENDIF(WITH_RYZOM_CLIENT) + IF(RYZOM_ETC_PREFIX) + CONFIGURE_FILE(client_default.cfg.in "${CMAKE_CURRENT_BINARY_DIR}/client_default.cfg") + INSTALL(FILES "${CMAKE_CURRENT_BINARY_DIR}/client_default.cfg" DESTINATION ${RYZOM_ETC_PREFIX}) + ELSE() + INSTALL(FILES client_default.cfg DESTINATION etc/ryzom) + ENDIF() +ENDIF()