From 8cf1c5541015e923d5b5f90096d2b4df5475c55e Mon Sep 17 00:00:00 2001 From: Shane Burrell Date: Sat, 14 Feb 2009 00:07:12 +0000 Subject: [PATCH] Use included apr git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@12006 d0543943-73ff-0310-b7d9-9358b9ac24b2 --- CMakeLists.txt | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index e7cfd4b919..733f666d27 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -16,7 +16,10 @@ ENDIF(Subversion_FOUND) SET( ${PROJECT_NAME}_MAJOR_VERSION 0 ) SET( ${PROJECT_NAME}_MINOR_VERSION 1 ) SET( ${PROJECT_NAME}_PATCH_LEVEL 0 ) -SET( ${SWITCH_VERSION_REVISION}$Project_WC_REVISION) + + +ADD_DEFINITIONS( "-DSWITCH_VERSION_REVISION=${Project_WC_REVISION}" ) + set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake_modules/") INCLUDE (CheckSymbolExists) @@ -125,16 +128,20 @@ FIND_PACKAGE(Threads) # DO APR -FIND_PACKAGE (APR) -FIND_PACKAGE (APRUtil) +#FIND_PACKAGE (APR) +#FIND_PACKAGE (APRUtil) + +#LINK_LIBRARIES (${APR_LIBS} ${APRUTIL_LIBS}) +LINK_LIBRARIES (${CMAKE_SOURCE_DIR}/libs/apr/.libs/libapr-1.a) +LINK_LIBRARIES (${CMAKE_SOURCE_DIR}/libs/apr-util/.libs/libaprutil-1.a) + -LINK_LIBRARIES (${APR_LIBS} ${APRUTIL_LIBS}) MESSAGE( STATUS "APR INFO------------------------------------------" ) MESSAGE( STATUS "APR_LIBS = ${APR_LIBS}" ) MESSAGE( STATUS "APRUTIL_LIBS = ${APRUTIL_LIBS}" ) MESSAGE( STATUS "--------------------------------------------------" ) -INCLUDE_DIRECTORIES (${APR_INCLUDES} ${APRUTIL_INCLUDES}) +#INCLUDE_DIRECTORIES (${APR_INCLUDES} ${APRUTIL_INCLUDES}) # DO SNDFILE