apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From traw...@apache.org
Subject svn commit: r1531289 - /apr/apr-util/branches/1.5.x/CMakeLists.txt
Date Fri, 11 Oct 2013 13:18:53 GMT
Author: trawick
Date: Fri Oct 11 13:18:53 2013
New Revision: 1531289

URL: http://svn.apache.org/r1531289
Log:
APR-Util equivalent of trunk r1530988:

Axe redundancy with specification of generated .h files
as a dependency of the various binaries.

Modified:
    apr/apr-util/branches/1.5.x/CMakeLists.txt

Modified: apr/apr-util/branches/1.5.x/CMakeLists.txt
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.5.x/CMakeLists.txt?rev=1531289&r1=1531288&r2=1531289&view=diff
==============================================================================
--- apr/apr-util/branches/1.5.x/CMakeLists.txt (original)
+++ apr/apr-util/branches/1.5.x/CMakeLists.txt Fri Oct 11 13:18:53 2013
@@ -98,8 +98,6 @@ SET(APR_INCLUDE_DIRECTORIES
 
 INCLUDE_DIRECTORIES(${APR_INCLUDE_DIRECTORIES} ${XMLLIB_INCLUDE_DIR})
 
-SET(APR_HEADERS ${PROJECT_BINARY_DIR}/apu.h)
-
 SET(APR_PUBLIC_HEADERS_STATIC
   include/apr_anylock.h
   include/apr_base64.h
@@ -228,13 +226,13 @@ ADD_LIBRARY(libexpat STATIC ${EXPAT_SOUR
 SET_TARGET_PROPERTIES(libexpat PROPERTIES COMPILE_DEFINITIONS "XML_STATIC;COMPILED_FROM_DSP")
 
 # libaprutil-1 is shared, aprutil-1 is static
-ADD_LIBRARY(libaprutil-1 SHARED ${APR_HEADERS} ${APR_SOURCES} ${PROJECT_BINARY_DIR}/apu.h
libaprutil.rc)
+ADD_LIBRARY(libaprutil-1 SHARED ${APR_SOURCES} ${APR_PUBLIC_HEADERS_GENERATED} libaprutil.rc)
 SET(install_targets ${install_targets} libaprutil-1)
 SET(install_bin_pdb ${install_bin_pdb} ${PROJECT_BINARY_DIR}/libaprutil-1.pdb)
 TARGET_LINK_LIBRARIES(libaprutil-1 ${APR_LIBRARIES} ${XMLLIB_LIBRARIES})
 SET_TARGET_PROPERTIES(libaprutil-1 PROPERTIES COMPILE_DEFINITIONS "APU_DECLARE_EXPORT;XML_STATIC")
 
-ADD_LIBRARY(aprutil-1 STATIC ${APR_HEADERS} ${APR_SOURCES} ${PROJECT_BINARY_DIR}/apu.h)
+ADD_LIBRARY(aprutil-1 STATIC ${APR_SOURCES} ${APR_PUBLIC_HEADERS_GENERATED})
 SET(install_targets ${install_targets} aprutil-1)
 SET(install_lib_pdb ${install_lib_pdb} ${PROJECT_BINARY_DIR}/aprutil-1.pdb)
 TARGET_LINK_LIBRARIES(aprutil-1 ${APR_LIBRARIES} ${XMLLIB_LIBRARIES})



Mime
View raw message