diff options
| author | Darrell Anderson <humanreadable@yahoo.com> | 2012-04-20 22:54:57 -0500 |
|---|---|---|
| committer | Darrell Anderson <humanreadable@yahoo.com> | 2012-04-20 22:54:57 -0500 |
| commit | 220261c98b3e497b8c34666d5ac22d33ba36da9f (patch) | |
| tree | 091a4a4d0cffd9d15ebf0ba802444db3b004429b | |
| parent | 5cba979a6ed56eae45bdcf3d17276804c6fc372e (diff) | |
| download | tdesvn-220261c98b3e497b8c34666d5ac22d33ba36da9f.tar.gz tdesvn-220261c98b3e497b8c34666d5ac22d33ba36da9f.zip | |
Fix failure to correctly detect Apache Portable Runtime (APR).
This resolves bug report 916.
Thanks to David C. Rankin.
| -rw-r--r-- | ConfigureChecks.cmake | 6 | ||||
| -rw-r--r-- | src/CMakeLists.txt | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake index 287113c..c682668 100644 --- a/ConfigureChecks.cmake +++ b/ConfigureChecks.cmake @@ -119,6 +119,12 @@ IF (UNIX) endif(NOT APU_CONFIG) EXEC_PROGRAM(${APR_CONFIG} ARGS "--includedir" OUTPUT_VARIABLE APR_INCLUDE_DIR_INT) + + pkg_search_module( APR apr-1 ) + if( NOT APR_FOUND ) + tde_message_fatal( "apr-1 is required, but was not found on your system" ) + endif( ) + EXEC_PROGRAM(${APU_CONFIG} ARGS "--includedir" OUTPUT_VARIABLE APU_INCLUDE_DIR_INT) SET(APR_INCLUDE_DIR "${APR_INCLUDE_DIR_INT}" CACHE INTERNAL "") SET(APU_INCLUDE_DIR "${APU_INCLUDE_DIR_INT}" CACHE INTERNAL "") diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index ccdbe9a..8acde74 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -25,7 +25,7 @@ include_directories( ${CMAKE_SOURCE_DIR}/src/svnfrontend ${CMAKE_SOURCE_DIR}/src/svnqt/cache ${SUBVERSION_INCLUDE_DIR} - /usr/include/apr-1.0 + ${APR_INCLUDE_DIRS} ) link_directories( |