From 14f81d7eef9faab9c6030cfa652e673697b1a7ec Mon Sep 17 00:00:00 2001 From: Nicolas Hake Date: Mon, 3 Oct 2011 13:03:22 +0200 Subject: [PATCH] Move cmake modules to separate directory --- CMakeLists.txt | 5 +++-- FindReadline.cmake => cmake/FindReadline.cmake | 0 GccPchSupport.cmake => cmake/GccPchSupport.cmake | 0 3 files changed, 3 insertions(+), 2 deletions(-) rename FindReadline.cmake => cmake/FindReadline.cmake (100%) rename GccPchSupport.cmake => cmake/GccPchSupport.cmake (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 4860c4da7..371028dd1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -25,6 +25,7 @@ cmake_minimum_required (VERSION 2.6.0) project (clonk CXX C) +list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake") include(Version.txt) @@ -793,7 +794,7 @@ FIND_PATH(OPENSSL_INCLUDE_DIR NAMES openssl/sha.h) include_directories(${OPENSSL_INCLUDE_DIR}) if(USE_CONSOLE) - include(./FindReadline.cmake) + find_package(Readline) include_directories(${READLINE_INCLUDE_DIRS}) SET(HAVE_LIBREADLINE ${READLINE_FOUND} CACHE INTERNAL "libreadline available") endif() @@ -1073,7 +1074,7 @@ endforeach() # Precompiled header support, gcc part (it needs the cxx flags) ############################################################################ -include(GccPchSupport.cmake) +include(GccPchSupport) if(CMAKE_COMPILER_IS_GNUCXX) if(NOT DEFINED USE_GCC_PCH) message("Using GCC precompiled headers! USE_GCC_PCH=Off to disable.") diff --git a/FindReadline.cmake b/cmake/FindReadline.cmake similarity index 100% rename from FindReadline.cmake rename to cmake/FindReadline.cmake diff --git a/GccPchSupport.cmake b/cmake/GccPchSupport.cmake similarity index 100% rename from GccPchSupport.cmake rename to cmake/GccPchSupport.cmake