From 60b119e0cafc1d0bc89bf81e81be00856b0ae42d Mon Sep 17 00:00:00 2001 From: click Date: Sat, 31 Jul 2010 05:36:05 +0200 Subject: [PATCH] Buildsystem/CMake: Revert changes from r0fa0512527 and use the proper checks (fix logic-error in buildfile) --HG-- branch : trunk --- CMakeLists.txt | 1 - src/server/CMakeLists.txt | 7 ++++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 114e8ccca75..cde22deeaf4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -12,7 +12,6 @@ project(TrinityCore) # CMake policies cmake_minimum_required(VERSION 2.6) -cmake_policy(SET CMP0002 OLD) cmake_policy(SET CMP0005 OLD) # diff --git a/src/server/CMakeLists.txt b/src/server/CMakeLists.txt index cf0c9f5ca72..4191d4c011a 100644 --- a/src/server/CMakeLists.txt +++ b/src/server/CMakeLists.txt @@ -17,7 +17,8 @@ if( SERVERS ) add_subdirectory(scripts) endif() add_subdirectory(worldserver) -endif() -if( TOOLS ) - add_subdirectory(collision) +else() + if( TOOLS ) + add_subdirectory(collision) + endif() endif()