From: Peter Lemenkov <lemenkov@gmail.com>
Date: Fri, 25 Jun 2010 12:16:45 +0400
Subject: [PATCH] Disable mysql++ in conference and early_announce modules
Unfortunately, this breaks existing configurations, which is a
no-go situation for EPEL repository. We'll enable it later.
Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
diff --git a/apps/conference/CMakeLists.txt b/apps/conference/CMakeLists.txt
index 23dea13..cbece59 100644
--- a/apps/conference/CMakeLists.txt
+++ b/apps/conference/CMakeLists.txt
@@ -13,12 +13,12 @@ IF(FLITE_FOUND AND ZRTP_FOUND)
SET(sems_module_libs ${sems_module_libs} flite_cmu_us_kal flite_usenglish flite_cmulex flite)
ENDIF(FLITE_FOUND AND ZRTP_FOUND)
-IF(MYSQLPP_FOUND)
- INCLUDE_DIRECTORIES(/usr/include/mysql)
- INCLUDE_DIRECTORIES(${MYSQLPP_INCLUDE_DIR}/mysql++)
- ADD_DEFINITIONS(-DUSE_MYSQL)
- SET(sems_module_libs ${sems_module_libs} mysqlpp)
-ENDIF(MYSQLPP_FOUND)
+#IF(MYSQLPP_FOUND)
+# INCLUDE_DIRECTORIES(/usr/include/mysql)
+# INCLUDE_DIRECTORIES(${MYSQLPP_INCLUDE_DIR}/mysql++)
+# ADD_DEFINITIONS(-DUSE_MYSQL)
+# SET(sems_module_libs ${sems_module_libs} mysqlpp)
+#ENDIF(MYSQLPP_FOUND)
SET(sems_module_name conference)
INCLUDE(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt)
diff --git a/apps/early_announce/CMakeLists.txt b/apps/early_announce/CMakeLists.txt
index 43c374e..03a1532 100644
--- a/apps/early_announce/CMakeLists.txt
+++ b/apps/early_announce/CMakeLists.txt
@@ -2,12 +2,12 @@ set (early_announce_SRCS
EarlyAnnounce.cpp
)
-IF(MYSQLPP_FOUND)
- INCLUDE_DIRECTORIES(/usr/include/mysql)
- INCLUDE_DIRECTORIES(${MYSQLPP_INCLUDE_DIR}/mysql++)
- ADD_DEFINITIONS(-DUSE_MYSQL)
- SET(sems_module_libs mysqlpp)
-ENDIF(MYSQLPP_FOUND)
+#IF(MYSQLPP_FOUND)
+# INCLUDE_DIRECTORIES(/usr/include/mysql)
+# INCLUDE_DIRECTORIES(${MYSQLPP_INCLUDE_DIR}/mysql++)
+# ADD_DEFINITIONS(-DUSE_MYSQL)
+# SET(sems_module_libs mysqlpp)
+#ENDIF(MYSQLPP_FOUND)
SET(sems_module_name early_announce)
INCLUDE(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt)