better libmysql-client detection (1819132a) · Commits · github_fork / Clip

fnordmetric-core/build/cmake/CMakeLists.txt

+7 −3

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

		@@ -160,12 +161,15 @@ install(TARGETS fnordmetric-server DESTINATION bin)

		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})
		target_link_libraries(fnordmetric-cli mysqlclient)
		target_link_libraries(fnordmetric-server mysqlclient)
		set(FNORD_ENABLE_MYSQL true)
		else()
		message("WARNING: libmysqlclient not found, FnordMetric will be compiled without MySQL support")
		endif()

		configure_file(config.h.in config.h)

+0 −2

Original line number	Diff line number	Diff line
		@@ -112,6 +112,4 @@ IF (MYSQL_INCLUDE_DIR AND MYSQL_LIB_DIR)

		MESSAGE(STATUS "MySQL Include dir: ${MYSQL_INCLUDE_DIR} library dir: ${MYSQL_LIB_DIR}")
		MESSAGE(STATUS "MySQL client libraries: ${MYSQL_CLIENT_LIBS}")
		ELSE (MYSQL_INCLUDE_DIR AND MYSQL_LIB_DIR)
		MESSAGE(FATAL_ERROR "Cannot find MySQL. Include dir: ${MYSQL_INCLUDE_DIR} library dir: ${MYSQL_LIB_DIR}")
		ENDIF (MYSQL_INCLUDE_DIR AND MYSQL_LIB_DIR)