On Mon, Jan 20, 2014 at 9:57 AM, <[email protected]> wrote: > Author: trawick > Date: Mon Jan 20 14:57:53 2014 > New Revision: 1559721 > > URL: http://svn.apache.org/r1559721 > Log: > Fix FILEOS tag in DLLs for cmake-based build. (libaprutil.rc > needs WINNT defined.) >
AFAICT the traditional Windows build of apr-util doesn't have a way to define WINNT. (IMO it isn't worth messing with but YMMV.) > (not worth mentioning in CHANGES) > > Modified: > apr/apr-util/branches/1.5.x/CMakeLists.txt > apr/apr-util/branches/1.5.x/README.cmake > > 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=1559721&r1=1559720&r2=1559721&view=diff > > ============================================================================== > --- apr/apr-util/branches/1.5.x/CMakeLists.txt (original) > +++ apr/apr-util/branches/1.5.x/CMakeLists.txt Mon Jan 20 14:57:53 2014 > @@ -221,6 +221,8 @@ SET(install_bin_pdb) > SET(install_lib_pdb) > SET(dbd_drivers) > > +# Note: The WINNT definition on some targets is used only by > libaprutil.rc. > + > # static expat (not installed) > ADD_LIBRARY(libexpat STATIC ${EXPAT_SOURCES}) > SET_TARGET_PROPERTIES(libexpat PROPERTIES COMPILE_DEFINITIONS > "XML_STATIC;COMPILED_FROM_DSP") > @@ -230,7 +232,7 @@ ADD_LIBRARY(libaprutil-1 SHARED ${APR_SO > 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") > +SET_TARGET_PROPERTIES(libaprutil-1 PROPERTIES COMPILE_DEFINITIONS > "APU_DECLARE_EXPORT;XML_STATIC;WINNT") > > ADD_LIBRARY(aprutil-1 STATIC ${APR_SOURCES} > ${APR_PUBLIC_HEADERS_GENERATED}) > SET(install_targets ${install_targets} aprutil-1) > @@ -246,6 +248,7 @@ IF(APU_HAVE_CRYPTO) > SET(install_targets ${install_targets} apr_crypto_openssl-1) > SET(install_bin_pdb ${install_bin_pdb} > ${PROJECT_BINARY_DIR}/apr_crypto_openssl-1.pdb) > SET_TARGET_PROPERTIES(apr_crypto_openssl-1 PROPERTIES > INCLUDE_DIRECTORIES "${APR_INCLUDE_DIRECTORIES};${OPENSSL_INCLUDE_DIR}") > + SET_TARGET_PROPERTIES(apr_crypto_openssl-1 PROPERTIES > COMPILE_DEFINITIONS "WINNT") > SET_TARGET_PROPERTIES(apr_crypto_openssl-1 PROPERTIES COMPILE_FLAGS > "-DDLL_NAME=apr_crypto_openssl") > TARGET_LINK_LIBRARIES(apr_crypto_openssl-1 libaprutil-1 > ${APR_LIBRARIES} ${OPENSSL_LIBRARIES}) > ENDIF() > @@ -257,7 +260,7 @@ IF(APU_HAVE_ODBC) > SET(dbd_drivers ${dbd_drivers} odbc) > TARGET_LINK_LIBRARIES(apr_dbd_odbc-1 libaprutil-1 ${APR_LIBRARIES} > odbc32 odbccp32) > SET_PROPERTY(TARGET apr_dbd_odbc-1 APPEND PROPERTY LINK_FLAGS > /export:apr_dbd_odbc_driver) > - SET_TARGET_PROPERTIES(apr_dbd_odbc-1 PROPERTIES COMPILE_DEFINITIONS > "APU_HAVE_ODBC;HAVE_SQL_H;APU_DECLARE_EXPORT;APU_DSO_MODULE_BUILD") > + SET_TARGET_PROPERTIES(apr_dbd_odbc-1 PROPERTIES COMPILE_DEFINITIONS > "APU_HAVE_ODBC;HAVE_SQL_H;APU_DECLARE_EXPORT;APU_DSO_MODULE_BUILD;WINNT") > SET_TARGET_PROPERTIES(apr_dbd_odbc-1 PROPERTIES COMPILE_FLAGS > "-DDLL_NAME=apr_dbd_odbc") > ENDIF() > > @@ -267,6 +270,7 @@ IF(APR_HAS_LDAP) > SET(install_targets ${install_targets} apr_ldap-1) > SET(install_bin_pdb ${install_bin_pdb} > ${PROJECT_BINARY_DIR}/apr_ldap-1.pdb) > TARGET_LINK_LIBRARIES(apr_ldap-1 libaprutil-1 ${APR_LIBRARIES} > ${LDAP_LIBRARIES}) > + SET_TARGET_PROPERTIES(apr_ldap-1 PROPERTIES COMPILE_DEFINITIONS "WINNT") > SET_TARGET_PROPERTIES(apr_ldap-1 PROPERTIES COMPILE_FLAGS > "-DDLL_NAME=apr_ldap") > SET(apr_ldap_libraries apr_ldap-1) > ELSE() > > Modified: apr/apr-util/branches/1.5.x/README.cmake > URL: > http://svn.apache.org/viewvc/apr/apr-util/branches/1.5.x/README.cmake?rev=1559721&r1=1559720&r2=1559721&view=diff > > ============================================================================== > --- apr/apr-util/branches/1.5.x/README.cmake (original) > +++ apr/apr-util/branches/1.5.x/README.cmake Mon Jan 20 14:57:53 2014 > @@ -4,6 +4,8 @@ Status > ------ > > This build support is currently intended only for Microsoft Windows. > +Only Windows NT-based systems can be targeted. (The traditional > +Windows build support for APR can target Windows 9x as well.) > > This build support is experimental. Specifically, > > > > -- Born in Roswell... married an alien... http://emptyhammock.com/
