From 21d1eee88c95b9d85af7bfd64c0f87cdd24a1dde Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Tue, 15 Sep 2009 13:53:06 +0000 Subject: [PATCH] Use INCLUDE_DIRECTORIES directive git-svn-id: http://svn.berlios.de/svnroot/repos/sems/trunk@1501 8eb893ce-cfd4-0310-b710-fb5ebe64c474 --- apps/conference/CMakeLists.txt | 17 +++-------------- apps/dsm/mods/mod_mysql/CMakeLists.txt | 9 ++------- apps/early_announce/CMakeLists.txt | 9 ++------- apps/ivr/CMakeLists.txt | 16 ++-------------- core/plug-in/gsm/CMakeLists.txt | 2 ++ core/plug-in/speex/CMakeLists.txt | 2 ++ 6 files changed, 13 insertions(+), 42 deletions(-) diff --git a/apps/conference/CMakeLists.txt b/apps/conference/CMakeLists.txt index adcefa42..70e0476a 100644 --- a/apps/conference/CMakeLists.txt +++ b/apps/conference/CMakeLists.txt @@ -7,25 +7,14 @@ SET_TARGET_PROPERTIES(conference PROPERTIES OUTPUT_NAME "conference") TARGET_LINK_LIBRARIES(conference ${CMAKE_DL_LIBS} pthread m) IF(FLITE_FOUND AND ZRTP_FOUND) - IF(CMAKE_COMPILER_IS_GNUCC) - SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -I${FLITE_INCLUDE_DIR}/flite") - ENDIF(CMAKE_COMPILER_IS_GNUCC) - - IF(CMAKE_COMPILER_IS_GNUCXX) - SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -I${FLITE_INCLUDE_DIR}/flite") - ENDIF(CMAKE_COMPILER_IS_GNUCXX) + INCLUDE_DIRECTORIES(${FLITE_INCLUDE_DIR}/flite) ADD_DEFINITIONS(-DWITH_SAS_TTS) TARGET_LINK_LIBRARIES(conference ${CMAKE_DL_LIBS} flite_cmu_us_kal flite_usenglish flite_cmulex flite) ENDIF(FLITE_FOUND AND ZRTP_FOUND) IF(MYSQLPP_FOUND) - IF(CMAKE_COMPILER_IS_GNUCC) - SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -I${MYSQLPP_INCLUDE_DIR}/mysql++ -I/usr/include/mysql") - ENDIF(CMAKE_COMPILER_IS_GNUCC) - - IF(CMAKE_COMPILER_IS_GNUCXX) - SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -I${MYSQLPP_INCLUDE_DIR}/mysql++ -I/usr/include/mysql") - ENDIF(CMAKE_COMPILER_IS_GNUCXX) + INCLUDE_DIRECTORIES(/usr/include/mysql) + INCLUDE_DIRECTORIES(${MYSQLPP_INCLUDE_DIR}/mysql++) ADD_DEFINITIONS(-DUSE_MYSQL) TARGET_LINK_LIBRARIES(conference ${CMAKE_DL_LIBS} mysqlpp) ENDIF(MYSQLPP_FOUND) diff --git a/apps/dsm/mods/mod_mysql/CMakeLists.txt b/apps/dsm/mods/mod_mysql/CMakeLists.txt index e8aa8848..5a81e556 100644 --- a/apps/dsm/mods/mod_mysql/CMakeLists.txt +++ b/apps/dsm/mods/mod_mysql/CMakeLists.txt @@ -2,13 +2,8 @@ set (mod_mysql_SRCS ModMysql.cpp ) -IF(CMAKE_COMPILER_IS_GNUCC) - SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -I/usr/include/mysql++ -I/usr/include/mysql") -ENDIF(CMAKE_COMPILER_IS_GNUCC) - -IF(CMAKE_COMPILER_IS_GNUCXX) - SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -I/usr/include/mysql++ -I/usr/include/mysql") -ENDIF(CMAKE_COMPILER_IS_GNUCXX) +INCLUDE_DIRECTORIES(/usr/include/mysql) +INCLUDE_DIRECTORIES(${MYSQLPP_INCLUDE_DIR}/mysql++) ADD_LIBRARY(mod_mysql SHARED ${mod_mysql_SRCS}) SET_TARGET_PROPERTIES(mod_mysql PROPERTIES OUTPUT_NAME "mod_mysql") diff --git a/apps/early_announce/CMakeLists.txt b/apps/early_announce/CMakeLists.txt index ede2bce1..74ea871c 100644 --- a/apps/early_announce/CMakeLists.txt +++ b/apps/early_announce/CMakeLists.txt @@ -7,13 +7,8 @@ SET_TARGET_PROPERTIES(early_announce PROPERTIES OUTPUT_NAME "early_announce") TARGET_LINK_LIBRARIES(early_announce ${CMAKE_DL_LIBS} pthread m) IF(MYSQLPP_FOUND) - IF(CMAKE_COMPILER_IS_GNUCC) - SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -I/usr/include/mysql++ -I/usr/include/mysql") - ENDIF(CMAKE_COMPILER_IS_GNUCC) - - IF(CMAKE_COMPILER_IS_GNUCXX) - SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -I/usr/include/mysql++ -I/usr/include/mysql") - ENDIF(CMAKE_COMPILER_IS_GNUCXX) + INCLUDE_DIRECTORIES(/usr/include/mysql) + INCLUDE_DIRECTORIES(${MYSQLPP_INCLUDE_DIR}/mysql++) ADD_DEFINITIONS(-DUSE_MYSQL) TARGET_LINK_LIBRARIES(early_announce ${CMAKE_DL_LIBS} mysqlpp) ENDIF(MYSQLPP_FOUND) diff --git a/apps/ivr/CMakeLists.txt b/apps/ivr/CMakeLists.txt index 078a36f3..01f75ffb 100644 --- a/apps/ivr/CMakeLists.txt +++ b/apps/ivr/CMakeLists.txt @@ -9,26 +9,14 @@ IvrSipRequest.cpp IvrUAC.cpp ) -IF(CMAKE_COMPILER_IS_GNUCC) - SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -I${PYTHON_INCLUDE_PATH}") -ENDIF(CMAKE_COMPILER_IS_GNUCC) - -IF(CMAKE_COMPILER_IS_GNUCXX) - SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -I${PYTHON_INCLUDE_PATH}") -ENDIF(CMAKE_COMPILER_IS_GNUCXX) +INCLUDE_DIRECTORIES(${PYTHON_INCLUDE_PATH}) ADD_LIBRARY(ivr SHARED ${ivr_SRCS}) SET_TARGET_PROPERTIES(ivr PROPERTIES OUTPUT_NAME "ivr") TARGET_LINK_LIBRARIES(ivr ${CMAKE_DL_LIBS} pthread m) IF(FLITE_FOUND) - IF(CMAKE_COMPILER_IS_GNUCC) - SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -I${FLITE_INCLUDE_DIR}/flite") - ENDIF(CMAKE_COMPILER_IS_GNUCC) - - IF(CMAKE_COMPILER_IS_GNUCXX) - SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -I${FLITE_INCLUDE_DIR}/flite") - ENDIF(CMAKE_COMPILER_IS_GNUCXX) + INCLUDE_DIRECTORIES(${FLITE_INCLUDE_DIR}/flite) ADD_DEFINITIONS(-DIVR_WITH_TTS) TARGET_LINK_LIBRARIES(ivr ${CMAKE_DL_LIBS} flite_cmu_us_kal flite_usenglish flite_cmulex flite) ENDIF(FLITE_FOUND) diff --git a/core/plug-in/gsm/CMakeLists.txt b/core/plug-in/gsm/CMakeLists.txt index a05b25f4..b5de11d5 100644 --- a/core/plug-in/gsm/CMakeLists.txt +++ b/core/plug-in/gsm/CMakeLists.txt @@ -2,6 +2,8 @@ set (gsm_SRCS gsm.c ) +INCLUDE_DIRECTORIES(${GSM_INCLUDE_DIR}) + ADD_LIBRARY(gsm SHARED ${gsm_SRCS}) SET_TARGET_PROPERTIES(gsm PROPERTIES OUTPUT_NAME "gsm") TARGET_LINK_LIBRARIES(gsm ${CMAKE_DL_LIBS} pthread ${GSM_LIBRARIES} m) diff --git a/core/plug-in/speex/CMakeLists.txt b/core/plug-in/speex/CMakeLists.txt index 9bf3e15b..4012b705 100644 --- a/core/plug-in/speex/CMakeLists.txt +++ b/core/plug-in/speex/CMakeLists.txt @@ -2,6 +2,8 @@ set (speex_SRCS speex.c ) +INCLUDE_DIRECTORIES(${SPEEX_INCLUDE_DIR}) + # module_cflags = -ansi # -DNOFPU ADD_LIBRARY(speex SHARED ${speex_SRCS}) SET_TARGET_PROPERTIES(speex PROPERTIES OUTPUT_NAME "speex")