From e79ea8bc3ebd92085395e69abc0c72a8923f5085 Mon Sep 17 00:00:00 2001
From: Markus Makela <markus.makela@mariadb.com>
Date: Sun, 18 Jan 2015 05:29:37 +0200
Subject: [PATCH] Removed INSTALL_DIR due to bug 689 being fixed and updated
 README to use 'cmake -LH' instead of listing the variables.

---
 CMakeLists.txt |  6 ------
 README         | 22 ++--------------------
 macros.cmake   | 44 --------------------------------------------
 3 files changed, 2 insertions(+), 70 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 63ea87811..c1160bae0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -9,12 +9,6 @@ set_maxscale_version()
 
 set(CMAKE_INSTALL_PREFIX "/usr/local/skysql/maxscale" CACHE PATH "Prefix prepended to install directories.")
 
-#for backwards compability with previous build, to be deprecated
-if(INSTALL_DIR)
-  set(CMAKE_INSTALL_PREFIX "${INSTALL_DIR}" CACHE INTERNAL "Prefix prepended to install directories." FORCE)
-endif()
-
-
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/")
 
 project(MaxScale)
diff --git a/README b/README
index e29914819..d894bf1ec 100644
--- a/README
+++ b/README
@@ -169,27 +169,9 @@ The default values that CMake uses can be found in the 'macros.cmake' file.
 If you wish to change these, edit the 'macros.cmake' file or define the 
 variables manually at configuration time.
 
-All the variables that control the CMake build process:
+To display all CMake variables with their descriptions:
 
-INSTALL_DIR=<path>				Installation directory
-
-BUILD_TYPE=<type>				Type of the build. One of None, Debug, DebugSymbols, Optimized. (default None)
-								DebugSymbols enables debugging symbols, Debug enables debugging symbols and code, 
-                                Optimized builds an optimized version.
-
-INSTALL_SYSTEM_FILES=[Y|N]		Install startup scripts and ld configuration files
-EMBEDDED_LIB=<path>				Path to the embedded library location (libmysqld.a for static and libmysqld.so for dynamic)
-MYSQL_DIR=<path>				Path to MySQL headers
-ERRMSG=<path>					Path to errmsg.sys file
-STATIC_EMBEDDED=[Y|N]			Whether to link the static or the dynamic verson of the library
-GCOV=[Y|N]						Generate gcov output
-OLEVEL=<0-3>					Level of optimization
-BUILD_TESTS=[Y|N]				Build tests
-DEBUG_OUTPUT=[Y|N]				Produce debugging output when configuring CMake
-RABBITMQ_LIBRARIES=<path>		Path to RabbitMQ-C libraries
-RABBITMQ_HEADERS=<path>			Path to RabbitMQ-C headers
-MYSQLCLIENT_LIBRARIES=<path>	Path to MySQL client libraries
-MYSQLCLIENT_HEADERS=<path>		Path to MySQL client headers
+   cmake -LH <path to source>
 
 \section Running  Running MaxScale
 
diff --git a/macros.cmake b/macros.cmake
index e3df7e2c5..c1cc18c7d 100644
--- a/macros.cmake
+++ b/macros.cmake
@@ -212,53 +212,9 @@ debugmsg("Search returned: ${MYSQL_DIR_LOC}")
   unset(DEB_FNC)
   unset(RPM_FNC)
 
-  #Find the MySQL client library
-#  find_library(MYSQLCLIENT_LIBRARIES NAMES mysqlclient PATH_SUFFIXES mysql mariadb)
-#  if(${MYSQLCLIENT_LIBRARIES} MATCHES "NOTFOUND")
-#	set(MYSQLCLIENT_FOUND FALSE CACHE INTERNAL "")
-#	message(STATUS "Cannot find MySQL client library: Login tests disabled.")
-#  else()
-#	set(MYSQLCLIENT_FOUND TRUE CACHE INTERNAL "")
-#	message(STATUS "Found MySQL client library: ${MYSQLCLIENT_LIBRARIES}")
-#  endif()
-
   #Check RabbitMQ headers and libraries
   if(BUILD_RABBITMQ)
 	find_package(RabbitMQ)
-#	include(CheckCSourceCompiles)
-#
-#	if(DEFINED RABBITMQ_LIB)
-#	  find_library(RMQ_LIB rabbitmq PATHS ${RABBITMQ_LIB} NO_DEFAULT_PATH)
-#	else()
-#	  find_library(RMQ_LIB rabbitmq)
-#	endif()
-#	if(RMQ_LIB MATCHES "NOTFOUND")
-#	  set(DEPS_OK FALSE CACHE BOOL "If all the dependencies were found.")
-#	  message(FATAL_ERROR "Cannot find RabbitMQ libraries, please define the path to the libraries with -DRABBITMQ_LIB=<path>")
-#	else()
-#	  set(RABBITMQ_LIB ${RMQ_LIB} CACHE PATH "Path to RabbitMQ libraries" FORCE)
-#	  message(STATUS "Using RabbitMQ libraries found at: ${RABBITMQ_LIB}")
-#	endif()
-#
-#	if(DEFINED RABBITMQ_HEADERS)
-#	  find_file(RMQ_HEADERS amqp.h PATHS ${RABBITMQ_HEADERS} NO_DEFAULT_PATH)
-#	else()
-#	  find_file(RMQ_HEADERS amqp.h)
-#	endif()
-#	if(RMQ_HEADERS MATCHES "NOTFOUND")
-#	  set(DEPS_OK FALSE CACHE BOOL "If all the dependencies were found.")
-#	  message(FATAL_ERROR "Cannot find RabbitMQ headers, please define the path to the headers with -DRABBITMQ_HEADERS=<path>")
-#	else()
-#	  set(RABBITMQ_HEADERS ${RMQ_HEADERS} CACHE PATH "Path to RabbitMQ headers" FORCE)
-#	  message(STATUS "Using RabbitMQ headers found at: ${RABBITMQ_HEADERS}")
-#	endif()
-#
-#	set(CMAKE_REQUIRED_INCLUDES ${RABBITMQ_HEADERS})
-#	check_c_source_compiles("#include <amqp.h>\n int main(){if(AMQP_DELIVERY_PERSISTENT){return 0;}return 1;}" HAVE_RMQ50)
-#	if(NOT HAVE_RMQ50)
-#	  message(FATAL_ERROR "Old version of RabbitMQ-C library found. Version 0.5 or newer is required.")
-#	endif()
-#	
   endif()
 
 endmacro()