From c2e080137aadc180bcb8531f0f63c3c4571d70f1 Mon Sep 17 00:00:00 2001
From: Roman Tsisyk <roman@tsisyk.com>
Date: Thu, 20 Jun 2013 12:51:49 +0400
Subject: [PATCH] Fix CMake scripts in src/plugins/
---
cmake/FindMySQL.cmake | 1 +
src/plugins/mysql/CMakeLists.txt | 9 ++++-----
src/plugins/pg/CMakeLists.txt | 8 +++-----
3 files changed, 8 insertions(+), 10 deletions(-)
diff --git a/cmake/FindMySQL.cmake b/cmake/FindMySQL.cmake
index aba75c7157..c10757d675 100644
--- a/cmake/FindMySQL.cmake
+++ b/cmake/FindMySQL.cmake
@@ -15,6 +15,7 @@ if(MYSQL_FOUND)
message(STATUS "Found MySQL includes: ${MYSQL_INCLUDE_DIR}/mysql.h")
message(STATUS "Found MySQL library: ${MYSQL_LIBRARIES}")
endif (NOT MYSQL_FIND_QUIETLY)
+ set(MYSQL_INCLUDE_DIRS ${MYSQL_INCLUDE_DIR})
else(MYSQL_FOUND)
if (MYSQL_FIND_REQUIRED)
message(FATAL_ERROR "Could not find mysql development files")
diff --git a/src/plugins/mysql/CMakeLists.txt b/src/plugins/mysql/CMakeLists.txt
index 6dd3c7fdc2..31965eeefc 100644
--- a/src/plugins/mysql/CMakeLists.txt
+++ b/src/plugins/mysql/CMakeLists.txt
@@ -1,12 +1,11 @@
include(FindMySQL)
if (MYSQL_FOUND)
- message(STATUS "box.net.sql(mysql) INC=${MYSQL_INCLUDE_DIR}")
- message(STATUS "box.net.sql(mysql) LIBS=mysqlclient_r")
+ message(STATUS "box.net.sql(mysql) INC=${MYSQL_INCLUDE_DIRS}")
+ message(STATUS "box.net.sql(mysql) LIBS=${MYSQL_LIBRARIES}")
- add_compile_flags("C;CXX" "-I${MYSQL_INCLUDE_DIR}")
- add_compile_flags("C;CXX" "-lmysqlclient_r")
- add_compile_flags("C;CXX" "-shared")
+ include_directories(${MYSQL_INCLUDE_DIRS})
add_library(mysql SHARED mysql.cc)
+ target_link_libraries(mysql ${MYSQL_LIBRARIES})
install(TARGETS mysql LIBRARY DESTINATION ${PLUGIN_DIR})
else()
message(STATUS "MySQL client not found")
diff --git a/src/plugins/pg/CMakeLists.txt b/src/plugins/pg/CMakeLists.txt
index f4cfc461d3..84714c7f3e 100644
--- a/src/plugins/pg/CMakeLists.txt
+++ b/src/plugins/pg/CMakeLists.txt
@@ -1,13 +1,11 @@
include(FindPostgreSQL)
if (PostgreSQL_FOUND)
- message(STATUS "box.net.sql(pg): INC=${PostgreSQL_INCLUDE_DIR}")
- message(STATUS "box.net.sql(pg): LIBDIR=${PostgreSQL_LIBRARY_DIR}")
+ message(STATUS "box.net.sql(pg): INC=${PostgreSQL_INCLUDE_DIRS}")
message(STATUS "box.net.sql(pg): LIBS=${PostgreSQL_LIBRARIES}")
- add_compile_flags("C;CXX" "-I${PostgreSQL_INCLUDE_DIR}")
- add_compile_flags("C;CXX" "-L${PostgreSQL_LIBRARY_DIR}")
- add_compile_flags("C;CXX" "-l${PostgreSQL_LIBRARIES}")
+ include_directories(${PostgreSQL_INCLUDE_DIRS})
add_library(pg SHARED pg.cc)
+ target_link_libraries(pg ${PostgreSQL_LIBRARIES})
install(TARGETS pg LIBRARY DESTINATION ${PLUGIN_DIR})
else()
--
GitLab