improve MySQL detection (e877cb7e) · Commits · github_fork / Clip

fnordmetric-core/build/cmake/CMakeLists.txt

+4 −8

Original line number	Diff line number	Diff line
		@@ -7,7 +7,7 @@
		# <http://www.gnu.org/licenses/>.
		cmake_minimum_required(VERSION 2.6)
		include(FindPkgConfig)
		include(CheckIncludeFileCXX)
		include(CheckIncludeFile)
		set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/modules/")
		project(fnordmetric)

		@@ -165,15 +165,11 @@ target_link_libraries(fnordmetric-server ${CMAKE_THREAD_LIBS_INIT})

		find_package(MySQL)
		if(MYSQL_FOUND)
		check_include_file_cxx(mysql.h FNORD_ENABLE_MYSQL)
		else()
		message("WARNING: libmysqlclient not found, FnordMetric will be compiled without MySQL support")
		endif()

		if(FNORD_ENABLE_MYSQL)
		include_directories(${MYSQL_INCLUDE_DIRS})
		set(FNORD_ENABLE_MYSQL true)
		target_link_libraries(fnordmetric-cli mysqlclient)
		target_link_libraries(fnordmetric-server mysqlclient)
		else()
		message("WARNING: libmysqlclient not found, FnordMetric will be compiled without MySQL support")
		endif()

		configure_file(config.h.in config.h)

+5 −5

Original line number	Diff line number	Diff line
		@@ -29,7 +29,7 @@ MySQLConnection::MySQLConnection() : mysql_(nullptr) {
		RAISE(kRuntimeError, "mysql_init() failed\n");
		}
		#else
		RAISE(kRuntimeError, "fnordmetric was compiled without libmysqlclient");
		RAISE(kRuntimeError, "FnordMetric was compiled without libmysqlclient");
		#endif
		}

		@@ -37,7 +37,7 @@ MySQLConnection::~MySQLConnection() {
		#ifdef FNORD_ENABLE_MYSQL
		mysql_close(mysql_);
		#else
		RAISE(kRuntimeError, "fnordmetric was compiled without libmysqlclient");
		RAISE(kRuntimeError, "FnordMetric was compiled without libmysqlclient");
		#endif
		}

		@@ -114,7 +114,7 @@ void MySQLConnection::connect(
		mysql_error(mysql_));
		}
		#else
		RAISE(kRuntimeError, "fnordmetric was compiled without libmysqlclient");
		RAISE(kRuntimeError, "FnordMetric was compiled without libmysqlclient");
		#endif
		}

		@@ -140,7 +140,7 @@ std::vector<std::string> MySQLConnection::describeTable(

		mysql_free_result(res);
		#else
		RAISE(kRuntimeError, "fnordmetric was compiled without libmysqlclient");
		RAISE(kRuntimeError, "FnordMetric was compiled without libmysqlclient");
		#endif
		return columns;
		}
		@@ -201,7 +201,7 @@ void MySQLConnection::executeQuery(

		mysql_free_result(result);
		#else
		RAISE(kRuntimeError, "fnordmetric was compiled without libmysqlclient");
		RAISE(kRuntimeError, "FnordMetric was compiled without libmysqlclient");
		#endif
		}