diff --git a/CMakeLists.txt b/CMakeLists.txt
index 30fe1c22..84a67b73 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,8 +1,12 @@
 cmake_minimum_required(VERSION 2.6)
 add_subdirectory(common)
-add_subdirectory(servatrice)
-add_subdirectory(cockatrice)
-add_subdirectory(oracle)
+if(WITH_SERVER)
+	add_subdirectory(servatrice)
+endif(WITH_SERVER)
+if (NOT WITHOUT_CLIENT)
+	add_subdirectory(cockatrice)
+	add_subdirectory(oracle)
+endif(NOT WITHOUT_CLIENT)
 
 FILE(GLOB sounds "${CMAKE_CURRENT_SOURCE_DIR}/sounds/*.raw")
 INSTALL(FILES ${sounds} DESTINATION share/cockatrice/sounds)