apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From traw...@apache.org
Subject svn commit: r1548236 - in /apr/apr/branches/1.5.x: CHANGES CMakeLists.txt
Date Thu, 05 Dec 2013 18:48:28 GMT
Author: trawick
Date: Thu Dec  5 18:48:28 2013
New Revision: 1548236

URL: http://svn.apache.org/r1548236
Log:
Fix .pdb file installation mixup:

* apr-1.pdb wasn't installed (should have been in PREFIX/lib)
* libapr-1.pdb was incorrectly installed to PREFIX/lib, in addition to 
  its correct location, PREFIX/bin

This issue did not exist in trunk.

Modified:
    apr/apr/branches/1.5.x/CHANGES
    apr/apr/branches/1.5.x/CMakeLists.txt

Modified: apr/apr/branches/1.5.x/CHANGES
URL: http://svn.apache.org/viewvc/apr/apr/branches/1.5.x/CHANGES?rev=1548236&r1=1548235&r2=1548236&view=diff
==============================================================================
--- apr/apr/branches/1.5.x/CHANGES [utf-8] (original)
+++ apr/apr/branches/1.5.x/CHANGES [utf-8] Thu Dec  5 18:48:28 2013
@@ -1,6 +1,9 @@
                                                      -*- coding: utf-8 -*-
 Changes for APR 1.5.1
 
+  *) Windows cmake build: Fix incorrect installation of some .pdb
+     files.  [Jeff Trawick]
+
   *) apr_skiplist: Add compatibility with C++ applications.
      [Jeff Trawick]
 

Modified: apr/apr/branches/1.5.x/CMakeLists.txt
URL: http://svn.apache.org/viewvc/apr/apr/branches/1.5.x/CMakeLists.txt?rev=1548236&r1=1548235&r2=1548236&view=diff
==============================================================================
--- apr/apr/branches/1.5.x/CMakeLists.txt (original)
+++ apr/apr/branches/1.5.x/CMakeLists.txt Thu Dec  5 18:48:28 2013
@@ -272,7 +272,7 @@ ADD_DEPENDENCIES(apr-1 test_char_header)
 # libaprapp-1 and aprapp-1 are static
 ADD_LIBRARY(libaprapp-1 STATIC misc/win32/apr_app.c misc/win32/internal.c ${APR_PUBLIC_HEADERS_GENERATED})
 SET(install_targets ${install_targets} libaprapp-1)
-SET(install_lib_pdb ${install_bin_pdb} ${PROJECT_BINARY_DIR}/libaprapp-1.pdb)
+SET(install_lib_pdb ${install_lib_pdb} ${PROJECT_BINARY_DIR}/libaprapp-1.pdb)
 SET_TARGET_PROPERTIES(libaprapp-1 PROPERTIES COMPILE_DEFINITIONS APR_APP)
 
 ADD_LIBRARY(aprapp-1 STATIC misc/win32/apr_app.c misc/win32/internal.c ${APR_PUBLIC_HEADERS_GENERATED})



Mime
View raw message