serf-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From br...@apache.org
Subject svn commit: r1844406 - in /serf/branches/1.4.x: ./ STATUS build/FindAPR.cmake
Date Sat, 20 Oct 2018 10:51:00 GMT
Author: brane
Date: Sat Oct 20 10:51:00 2018
New Revision: 1844406

URL: http://svn.apache.org/viewvc?rev=1844406&view=rev
Log:
Given that r1844404 affects only the CMake build, which is
experimental, go ahead and merge it from trunk.

Modified:
    serf/branches/1.4.x/   (props changed)
    serf/branches/1.4.x/STATUS
    serf/branches/1.4.x/build/FindAPR.cmake

Propchange: serf/branches/1.4.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Oct 20 10:51:00 2018
@@ -4,3 +4,4 @@
 /serf/branches/multiple_ssl_impls:1699382
 /serf/branches/ocsp-verification:1771887-1830822
 /serf/branches/windows-sspi:1698866-1698877
+/serf/trunk:1842253-1844405

Modified: serf/branches/1.4.x/STATUS
URL: http://svn.apache.org/viewvc/serf/branches/1.4.x/STATUS?rev=1844406&r1=1844405&r2=1844406&view=diff
==============================================================================
--- serf/branches/1.4.x/STATUS (original)
+++ serf/branches/1.4.x/STATUS Sat Oct 20 10:51:00 2018
@@ -11,11 +11,6 @@ Status of 1.4.0:
 Candidate changes:
 ==================
 
- * r1844404
-   Fix CMake's FindAPR(Util) for embedded builds.
-   Votes:
-     +1: brane
-
 Veto-blocked changes:
 =====================
 

Modified: serf/branches/1.4.x/build/FindAPR.cmake
URL: http://svn.apache.org/viewvc/serf/branches/1.4.x/build/FindAPR.cmake?rev=1844406&r1=1844405&r2=1844406&view=diff
==============================================================================
--- serf/branches/1.4.x/build/FindAPR.cmake (original)
+++ serf/branches/1.4.x/build/FindAPR.cmake Sat Oct 20 10:51:00 2018
@@ -126,6 +126,9 @@ endfunction(_apru_extras)
 
 # From the list of link libraries, extract the imported location
 function(_apru_location _location_var _extralibs_var)
+  unset(_dir)
+  unset(_lib)
+  unset(_extra)
   foreach(_part ${ARGN})
     string(SUBSTRING "${_part}" 0 2 _flag)
     if(_flag STREQUAL "-L")



Mime
View raw message