Build/Misc: Fix compile

Arkania · May 9, 2014 · b3817d9 · b3817d9
1 parent d72974b
commit b3817d9
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 5 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -13,4 +13,5 @@
 *.txt        whitespace=trailing-space,space-before-tab,cr-at-eol
 
 # special files which must ignore whitespace
-*.patch      whitespace=-trailing-space
+*.patch      whitespace=-trailing-space eol=lf
+*.diff       whitespace=-trailing-space eol=lf
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2008-2012 TrinityCore <http://www.trinitycore.org/>
+# Copyright (C) 2008-2014 TrinityCore <http://www.trinitycore.org/>
 #
 # This file is free software; as a special exception the author gives
 # unlimited permission to copy and/or distribute it, with or without
@@ -12,9 +12,13 @@
 project(ArkCORE4-NG)
 
 # CMake policies (can not be handled elsewhere)
-cmake_minimum_required(VERSION 2.8)
+cmake_minimum_required(VERSION 2.8.9)
 cmake_policy(SET CMP0005 OLD)
 
+# add this options before PROJECT keyword
+set(CMAKE_DISABLE_SOURCE_CHANGES ON)
+set(CMAKE_DISABLE_IN_SOURCE_BUILD ON)
+
 # Set RPATH-handing (CMake parameters)
 set(CMAKE_SKIP_BUILD_RPATH 0)
 set(CMAKE_BUILD_WITH_INSTALL_RPATH 0)
@@ -44,9 +48,14 @@ endif()
 include(CheckPlatform)
 
 # basic packagesearching and setup (further support will be needed, this is a preliminary release!)
+set(OPENSSL_EXPECTED_VERSION 1.0.0)
+set(ACE_EXPECTED_VERSION 5.8.3)
+
 find_package(PCHSupport)
 find_package(ACE REQUIRED)
 find_package(OpenSSL REQUIRED)
+find_package(Threads REQUIRED)
+
 if( NOT USE_MYSQL_SOURCES )
   find_package(MySQL REQUIRED)
 endif()
@@ -57,6 +66,10 @@ if( UNIX )
   find_package(BZip2)
 endif()
 
+if(NOT WITHOUT_GIT)
+  find_package(Git)
+endif()
+
 # Find revision ID and hash of the sourcetree
 include(cmake/genrev.cmake)
 

diff --git a/PreLoad.cmake b/PreLoad.cmake
@@ -1,4 +1,4 @@
-# Copyright (C) 2005-2012 Trinity <http://www.trinitycore.org/>
+# Copyright (C) 2008-2014 TrinityCore <http://www.trinitycore.org/>
 #
 # This file is free software; as a special exception the author gives
 # unlimited permission to copy and/or distribute it, with or without

diff --git a/src/server/authserver/authserver.conf.dist b/src/server/authserver/authserver.conf.dist
@@ -1,5 +1,5 @@
 ###############################################
-# ArkCORE Core Auth Server configuration file #
+# ArkCORE Auth Server configuration file #
 ###############################################
 [authserver]