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