You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@celix.apache.org by ab...@apache.org on 2013/09/19 16:08:10 UTC

svn commit: r1524743 - /incubator/celix/trunk/cmake/modules/FindAPR.cmake

Author: abroekhuis
Date: Thu Sep 19 14:08:09 2013
New Revision: 1524743

URL: http://svn.apache.org/r1524743
Log:
CELIX-71: Applied patch

Modified:
    incubator/celix/trunk/cmake/modules/FindAPR.cmake

Modified: incubator/celix/trunk/cmake/modules/FindAPR.cmake
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/cmake/modules/FindAPR.cmake?rev=1524743&r1=1524742&r2=1524743&view=diff
==============================================================================
--- incubator/celix/trunk/cmake/modules/FindAPR.cmake (original)
+++ incubator/celix/trunk/cmake/modules/FindAPR.cmake Thu Sep 19 14:08:09 2013
@@ -31,12 +31,13 @@ FIND_PATH(APR_INCLUDE_DIR apr.h
 /usr/local/include/apr-1.0
 /usr/include/apr-1
 /usr/include/apr-1.0
+/usr/local/apr/include/apr-1
 )
 
 SET(APR_NAMES ${APR_NAMES} apr-1)
 FIND_LIBRARY(APR_LIBRARY
   NAMES ${APR_NAMES}
-  PATHS /usr/lib /usr/local/lib
+  PATHS /usr/lib /usr/local/lib /usr/local/apr/lib
   )
 
 IF (APR_LIBRARY AND APR_INCLUDE_DIR)
@@ -73,12 +74,13 @@ FIND_PATH(APRUTIL_INCLUDE_DIR apu.h
 /usr/local/include/apr-1.0
 /usr/include/apr-1
 /usr/include/apr-1.0
+/usr/local/apr/include/apr-1
 )
 
 SET(APRUTIL_NAMES ${APRUTIL_NAMES} aprutil-1)
 FIND_LIBRARY(APRUTIL_LIBRARY
   NAMES ${APRUTIL_NAMES}
-  PATHS /usr/lib /usr/local/lib
+  PATHS /usr/lib /usr/local/lib /usr/local/apr/lib
   )
 
 IF (APRUTIL_LIBRARY AND APRUTIL_INCLUDE_DIR)