From 09ea41679fe6f688d099760106fd03e87cdf01c6 Mon Sep 17 00:00:00 2001 From: kaetemi Date: Wed, 1 May 2019 07:05:26 +0800 Subject: [PATCH] Fix build project. Can't build server tools without ai share --- code/ryzom/tools/CMakeLists.txt | 9 +++++++-- code/ryzom/tools/client/CMakeLists.txt | 2 +- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/code/ryzom/tools/CMakeLists.txt b/code/ryzom/tools/CMakeLists.txt index 789ec684f..b97c9be8e 100644 --- a/code/ryzom/tools/CMakeLists.txt +++ b/code/ryzom/tools/CMakeLists.txt @@ -1,3 +1,6 @@ + +FIND_PACKAGE(MySQL) + IF(WITH_RYZOM_TOOLS) ADD_SUBDIRECTORY(skill_extractor) ADD_SUBDIRECTORY(make_alias_file) @@ -17,7 +20,6 @@ IF(WITH_RYZOM_TOOLS) ADD_SUBDIRECTORY(patch_gen) IF(WIN32) - FIND_PACKAGE(MySQL) IF(MYSQL_FOUND) ADD_SUBDIRECTORY(sheets_packer_shard) ENDIF() @@ -30,7 +32,10 @@ IF(WITH_RYZOM_TOOLS) ENDIF() ADD_SUBDIRECTORY(client) -ADD_SUBDIRECTORY(server) + +IF(MYSQL_FOUND) + ADD_SUBDIRECTORY(server) +ENDIF() # Old stuff that doesn't compile anymore. #ADD_SUBDIRECTORY(occ2huff) diff --git a/code/ryzom/tools/client/CMakeLists.txt b/code/ryzom/tools/client/CMakeLists.txt index 66f8c9b48..d4f136b3c 100644 --- a/code/ryzom/tools/client/CMakeLists.txt +++ b/code/ryzom/tools/client/CMakeLists.txt @@ -14,6 +14,6 @@ IF(WITH_QT5 AND WITH_RYZOM_INSTALLER) ADD_SUBDIRECTORY(ryzom_installer) ENDIF() -IF(WITH_RYZOM_TOOLS) +IF(WITH_RYZOM_TOOLS AND MYSQL_FOUND) ADD_SUBDIRECTORY(r2_islands_textures) ENDIF()