diff --git a/code/ryzom/CMakeLists.txt b/code/ryzom/CMakeLists.txt
index 6e0747350..eda0375d2 100644
--- a/code/ryzom/CMakeLists.txt
+++ b/code/ryzom/CMakeLists.txt
@@ -24,15 +24,9 @@ IF(WITH_RYZOM_TOOLS)
   ADD_SUBDIRECTORY(tools)
 ENDIF(WITH_RYZOM_TOOLS)
 
-IF(WITH_RYZOM_SERVER)
-
-  FIND_PACKAGE(MySQL REQUIRED)
-  ADD_SUBDIRECTORY(server)
-  
-ELSEIF(WITH_RYZOM_TOOLS)
-
+IF(WITH_RYZOM_SERVER OR WITH_RYZOM_TOOLS)
   # Need servershare for build packed collision tool
   # Need aishare for build wmap tool
+  FIND_PACKAGE(MySQL REQUIRED)
   ADD_SUBDIRECTORY(server)
-
-ENDIF(WITH_RYZOM_SERVER)
+ENDIF(WITH_RYZOM_SERVER OR WITH_RYZOM_TOOLS)