Return-Path: X-Original-To: apmail-apr-commits-archive@www.apache.org Delivered-To: apmail-apr-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 3022F113B1 for ; Mon, 15 Sep 2014 22:46:20 +0000 (UTC) Received: (qmail 53666 invoked by uid 500); 15 Sep 2014 22:46:20 -0000 Delivered-To: apmail-apr-commits-archive@apr.apache.org Received: (qmail 53612 invoked by uid 500); 15 Sep 2014 22:46:20 -0000 Mailing-List: contact commits-help@apr.apache.org; run by ezmlm Precedence: bulk List-Post: List-Help: List-Unsubscribe: Reply-To: dev@apr.apache.org List-Id: Delivered-To: mailing list commits@apr.apache.org Received: (qmail 53602 invoked by uid 99); 15 Sep 2014 22:46:20 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 15 Sep 2014 22:46:20 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 15 Sep 2014 22:45:57 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 483992388868; Mon, 15 Sep 2014 22:45:56 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1625175 - /apr/apr/trunk/CMakeLists.txt Date: Mon, 15 Sep 2014 22:45:56 -0000 To: commits@apr.apache.org From: trawick@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20140915224556.483992388868@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: trawick Date: Mon Sep 15 22:45:55 2014 New Revision: 1625175 URL: http://svn.apache.org/r1625175 Log: cmake >= 2.8.12 doesn't generate .pdb files for static libs, and points out that they aren't useful anyway: http://public.kitware.com/Bug/view.php?id=14600 remove .pdb handling for static libs regardless of cmake version Modified: apr/apr/trunk/CMakeLists.txt Modified: apr/apr/trunk/CMakeLists.txt URL: http://svn.apache.org/viewvc/apr/apr/trunk/CMakeLists.txt?rev=1625175&r1=1625174&r2=1625175&view=diff ============================================================================== --- apr/apr/trunk/CMakeLists.txt (original) +++ apr/apr/trunk/CMakeLists.txt Mon Sep 15 22:45:55 2014 @@ -413,7 +413,6 @@ SET(APR_TEST_SOURCES SET(install_targets) SET(install_bin_pdb) -SET(install_lib_pdb) SET(dbd_drivers) # libapr-2 is shared, apr-2 is static @@ -426,7 +425,7 @@ ADD_DEPENDENCIES(libapr-2 test_char_head ADD_LIBRARY(apr-2 STATIC ${APR_SOURCES} ${APR_PUBLIC_HEADERS_GENERATED}) SET(install_targets ${install_targets} apr-2) -SET(install_lib_pdb ${install_lib_pdb} ${PROJECT_BINARY_DIR}/apr-2.pdb) +# no .pdb file generated for static libraries TARGET_LINK_LIBRARIES(apr-2 ${XMLLIB_LIBRARIES} ${APR_SYSTEM_LIBS}) SET_TARGET_PROPERTIES(apr-2 PROPERTIES COMPILE_DEFINITIONS "APR_DECLARE_STATIC;APR_HAVE_MODULAR_DSO") ADD_DEPENDENCIES(apr-2 test_char_header) @@ -434,12 +433,10 @@ ADD_DEPENDENCIES(apr-2 test_char_header) # libaprapp-2 and aprapp-2 are static ADD_LIBRARY(libaprapp-2 STATIC misc/win32/apr_app.c misc/win32/internal.c ${APR_PUBLIC_HEADERS_GENERATED}) SET(install_targets ${install_targets} libaprapp-2) -SET(install_lib_pdb ${install_lib_pdb} ${PROJECT_BINARY_DIR}/libaprapp-2.pdb) SET_TARGET_PROPERTIES(libaprapp-2 PROPERTIES COMPILE_DEFINITIONS APR_APP) ADD_LIBRARY(aprapp-2 STATIC misc/win32/apr_app.c misc/win32/internal.c ${APR_PUBLIC_HEADERS_GENERATED}) SET(install_targets ${install_targets} aprapp-2) -SET(install_lib_pdb ${install_lib_pdb} ${PROJECT_BINARY_DIR}/aprapp-2.pdb) SET_TARGET_PROPERTIES(aprapp-2 PROPERTIES COMPILE_DEFINITIONS "APR_DECLARE_STATIC;APR_APP") IF(APU_HAVE_CRYPTO) @@ -587,10 +584,6 @@ IF(INSTALL_PDB) INSTALL(FILES ${install_bin_pdb} DESTINATION bin CONFIGURATIONS RelWithDebInfo Debug) - - INSTALL(FILES ${install_lib_pdb} - DESTINATION lib - CONFIGURATIONS RelWithDebInfo Debug) ENDIF() INSTALL(FILES ${APR_PUBLIC_HEADERS_STATIC} ${APR_PUBLIC_HEADERS_GENERATED} DESTINATION include)