On 03/14/2012 06:09 PM, David C. Rankin wrote:
On 03/14/2012 05:48 PM, Serghei Amelian wrote:
I think there is no check for apr. Insert
somewhere in ConfigureChecks.cmake a
code like this:
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( )
Serghei,
I think I found the problem. Where is APR_INCLUDE_DIR set from
APR_INCLUDE_DIR_INT?? All I find is:
EXEC_PROGRAM(${APR_CONFIG} ARGS "--includedir" OUTPUT_VARIABLE
APR_INCLUDE_DIR_INT)
which works to set APR_INCLUDE_DIR_INT, but I can't find anywhere that there is a:
SET(APR_INCLUDE_DIR ${APR_INCLUDE_DIR_INT})
WHEW - solved - but you still need to figure out where to put this stuff in the
final version of the cmake files:
diff -uNr ../tdesvn.orig/ConfigureChecks.cmake ./ConfigureChecks.cmake
--- ../tdesvn.orig/ConfigureChecks.cmake 2012-02-16 11:55:15.000000000 -0600
+++ ./ConfigureChecks.cmake 2012-03-14 18:21:22.606110951 -0500
@@ -119,6 +119,8 @@
endif(NOT APU_CONFIG)
EXEC_PROGRAM(${APR_CONFIG} ARGS "--includedir" OUTPUT_VARIABLE
APR_INCLUDE_DIR_INT)
+SET(APR_INCLUDE_DIRS ${APR_INCLUDE_DIR_INT})
+
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 -uNr ../tdesvn.orig/src/CMakeLists.txt ./src/CMakeLists.txt
--- ../tdesvn.orig/src/CMakeLists.txt 2012-02-16 11:55:15.000000000 -0600
+++ ./src/CMakeLists.txt 2012-03-14 18:21:11.540201043 -0500
@@ -25,7 +25,7 @@
${CMAKE_SOURCE_DIR}/src/svnfrontend
${CMAKE_SOURCE_DIR}/src/svnqt/cache
${SUBVERSION_INCLUDE_DIR}
- /usr/include/apr-1.0
+ ${APR_INCLUDE_DIRS}
)
link_directories(
I'll upload the patch to the bug report.
--
David C. Rankin, J.D.,P.E.