remove outdated custom CMake Modules.

only keep what is not in CMake 3.6.

CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 2.6)
+cmake_minimum_required(VERSION 3.6)
 if (WIN32)
 FILE(TO_CMAKE_PATH "${CMAKE_MODULE_PATH}" CMAKE_MODULE_PATH )
 FILE(TO_CMAKE_PATH "${CMAKE_PREFIX_PATH}" CMAKE_PREFIX_PATH )
@@ -6,6 +6,8 @@ endif(WIN32)
 
 project (eressea-server C)
 
+set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/Modules/")
+
 enable_testing()
 find_package (LibXml2)
 find_package (SQLite3)

cmake/Modules/FindMSVC.cmake

@@ -0,0 +1,21 @@
+MACRO (MSVC_CRT_SECURE_NO_WARNINGS)
+    IF (MSVC)
+        FOREACH (target ${ARGN})
+            SET_TARGET_PROPERTIES (${target} PROPERTIES
+                COMPILE_DEFINITIONS _CRT_SECURE_NO_WARNINGS
+            )
+        ENDFOREACH (target)
+    ENDIF (MSVC)
+ENDMACRO (MSVC_CRT_SECURE_NO_WARNINGS)
+
+MACRO (MSVC_SET_WARNING_LEVEL level)
+    IF (MSVC)
+    IF(CMAKE_C_FLAGS MATCHES "/W[0-4]")
+        STRING(REGEX REPLACE "/W[0-4]" "/W${level}" CMAKE_C_FLAGS "${CMAKE_C_FLAGS}")
+    ELSE()
+        SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /W${level}")
+    ENDIF()
+    ENDIF(MSVC)
+ENDMACRO (MSVC_SET_WARNING_LEVEL)
+
+SET(MSVC_FOUND 1)

cmake/Modules/FindSQLite3.cmake

@@ -0,0 +1,37 @@
+# Copyright (C) 2007-2009 LuaDist.
+# Created by Peter Kapec <kapecp@gmail.com>
+# Redistribution and use of this file is allowed according to the terms of the MIT license.
+# For details see the COPYRIGHT file distributed with LuaDist.
+#	Note:
+#		Searching headers and libraries is very simple and is NOT as powerful as scripts
+#		distributed with CMake, because LuaDist defines directories to search for.
+#		Everyone is encouraged to contact the author with improvements. Maybe this file
+#		becomes part of CMake distribution sometimes.
+
+# - Find sqlite3
+# Find the native SQLITE3 headers and libraries.
+#
+# SQLITE3_INCLUDE_DIRS	- where to find sqlite3.h, etc.
+# SQLITE3_LIBRARIES	- List of libraries when using sqlite.
+# SQLITE3_FOUND	- True if sqlite found.
+
+# Look for the header file.
+FIND_PATH(SQLITE3_INCLUDE_DIR NAMES sqlite3.h)
+
+# Look for the library.
+FIND_LIBRARY(SQLITE3_LIBRARY NAMES sqlite)
+
+# Handle the QUIETLY and REQUIRED arguments and set SQLITE3_FOUND to TRUE if all listed variables are TRUE.
+INCLUDE(FindPackageHandleStandardArgs)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(SQLITE3 DEFAULT_MSG SQLITE3_LIBRARY SQLITE3_INCLUDE_DIR)
+
+# Copy the results to the output variables.
+IF(SQLITE3_FOUND)
+	SET(SQLITE3_LIBRARIES ${SQLITE3_LIBRARY})
+	SET(SQLITE3_INCLUDE_DIRS ${SQLITE3_INCLUDE_DIR})
+ELSE(SQLITE3_FOUND)
+	SET(SQLITE3_LIBRARIES)
+	SET(SQLITE3_INCLUDE_DIRS)
+ENDIF(SQLITE3_FOUND)
+
+MARK_AS_ADVANCED(SQLITE3_INCLUDE_DIRS SQLITE3_LIBRARIES)

cmake/Modules/FindToLua.cmake

@@ -0,0 +1,71 @@
+# - Try to find the ToLua library
+# Once done this will define
+#
+#  TOLUA_FOUND - System has ToLua
+#  TOLUA_INCLUDE_DIR - The ToLua include directory
+#  TOLUA_LIBRARIES - The libraries needed to use ToLua
+#  TOLUA_DEFINITIONS - Compiler switches required for using ToLua
+#  TOLUA_EXECUTABLE - The ToLua command line shell
+#  TOLUA_VERSION_STRING - the version of ToLua found (since CMake 2.8.8)
+
+#=============================================================================
+# Copyright 2006-2009 Kitware, Inc.
+# Copyright 2006 Alexander Neundorf <neundorf@kde.org>
+#
+# Distributed under the OSI-approved BSD License (the "License");
+# see accompanying file Copyright.txt for details.
+#
+# This software is distributed WITHOUT ANY WARRANTY; without even the
+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+# See the License for more information.
+#=============================================================================
+# (To distribute this file outside of CMake, substitute the full
+#  License text for the above reference.)
+
+# use pkg-config to get the directories and then use these values
+# in the find_path() and find_library() calls
+find_package(PkgConfig QUIET)
+PKG_CHECK_MODULES(PC_TOLUA QUIET ToLua)
+set(TOLUA_DEFINITIONS ${PC_TOLUA_CFLAGS_OTHER})
+
+find_path(TOLUA_INCLUDE_DIR NAMES tolua.h
+   HINTS
+   ${PC_TOLUA_DIR}/include
+   ${PC_TOLUA_INCLUDEDIR}
+   ${PC_TOLUA_INCLUDE_DIRS}
+   )
+find_library(TOLUA_LIBRARY NAMES tolua
+   HINTS
+   ${PC_TOLUA_DIR}/lib
+   ${PC_TOLUA_LIBDIR}
+   ${PC_TOLUA_LIBRARY_DIRS}
+   )
+find_program(TOLUA_EXECUTABLE tolua
+   HINTS
+   ${PC_TOLUA_DIR}/bin
+   ${PC_TOLUA_LIBDIR}
+   ${PC_TOLUA_LIBRARY_DIRS}
+)
+
+SET( TOLUA_LIBRARIES "${TOLUA_LIBRARY}" CACHE STRING "ToLua Libraries")
+
+if(PC_TOLUA_VERSION)
+    set(TOLUA_VERSION_STRING ${PC_TOLUA_VERSION})
+elseif(TOLUA_INCLUDE_DIR AND EXISTS "${TOLUA_INCLUDE_DIR}/tolua.h")
+    file(STRINGS "${TOLUA_INCLUDE_DIR}/tolua.h" tolua_version_str
+         REGEX "^#define[\t ]+TOLUA_VERSION[\t ]+\".*\"")
+
+    string(REGEX REPLACE "^#define[\t ]+TOLUA_VERSION[\t ]+\"tolua ([^\"]*)\".*" "\\1"
+           TOLUA_VERSION_STRING "${tolua_version_str}")
+    unset(tolua_version_str)
+endif()
+
+# handle the QUIETLY and REQUIRED arguments and set TOLUA_FOUND to TRUE if
+# all listed variables are TRUE
+include(FindPackageHandleStandardArgs)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(ToLua
+                                  REQUIRED_VARS TOLUA_LIBRARY TOLUA_INCLUDE_DIR TOLUA_EXECUTABLE
+                                  VERSION_VAR TOLUA_VERSION_STRING)
+
+mark_as_advanced(TOLUA_INCLUDE_DIR TOLUA_LIBRARIES TOLUA_EXECUTABLE)
+

s/cmake-init

@@ -29,8 +29,7 @@ if [ -d $HOME/usr ]; then
 fi
 
 DEST=$(dirname $ROOT)/server
-ARGS=" -DCMAKE_MODULE_PATH=$ROOT/cmake/Modules \
+ARGS=" -DCMAKE_BUILD_TYPE=$BUILD \
- -DCMAKE_BUILD_TYPE=$BUILD \
  -DCMAKE_LIBRARY_PATH=$LIBRARY_PATH \
  -DCMAKE_INCLUDE_PATH=$INCLUDE_PATH \
  -DCMAKE_PREFIX_PATH=$PREFIX_PATH \