Author: shaneb Date: Fri Feb 13 18:07:12 2009 New Revision: 12006 Log: Use included apr Modified: freeswitch/trunk/CMakeLists.txt Modified: freeswitch/trunk/CMakeLists.txt ============================================================================== --- freeswitch/trunk/CMakeLists.txt (original) +++ freeswitch/trunk/CMakeLists.txt Fri Feb 13 18:07:12 2009 @@ -16,7 +16,10 @@ 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 @@ # 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