trinity-devel@lists.pearsoncomputing.net

Message: previous - next
Month: March 2012

Re: [trinity-devel] SOLVED Re: [trinity-devel] Why? TDE cmake does NOT respect 'export CMAKE_INCLUDE_PATH=X'

From: Darrell Anderson <humanreadable@...>
Date: Wed, 14 Mar 2012 17:11:09 -0700 (PDT)
> It does :)
> 
>   Final form of patch uploaded. Serghei will still need
> to figure out where he
> wants to move the info within ConfigureChecks.cmake. The
> patch is:
> 
> 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:44:38.613923907 -0500
> @@ -119,6 +119,12 @@
>    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 -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(
> 
> 
>   Works fine:
> 
> ==> Tidying install...
>   -> Purging unwanted files...
>   -> Compressing man and info pages...
> ==> Creating package...
>   -> Generating .PKGINFO file...
>   -> Compressing package...
> ==> Leaving fakeroot environment.
> ==> Finished making: tde-tdesvn 3513_tqt-1 (Wed Mar 14
> 23:48:54 UTC 2012)

Is apr an option or requirement? If the former then the CMakeLists.txt should contain a -DWITH_APR option or something similar. Then the pkg-config test occurs only if ( WITH_APR).

Darrell