  ADD_LIBRARY(aprapp-1 STATIC misc/win32/apr_app.c misc/win32/internal.c ${APR_PUBLIC_HEADERS_GENERATED})
  SET(install_targets ${install_targets} aprapp-1)
  SET_TARGET_PROPERTIES(aprapp-1 PROPERTIES COMPILE_DEFINITIONS "APR_DECLARE_STATIC;APR_APP;WINNT")
++SET_TARGET_PROPERTIES(aprapp-1 PROPERTIES OUTPUT_NAME aprapp-1${ver})
 +endif(WIN32)
  
  IF(APR_BUILD_TESTAPR)
    ENABLE_TESTING()
-@@ -303,8 +424,12 @@ IF(APR_BUILD_TESTAPR)
+@@ -303,8 +425,12 @@ IF(APR_BUILD_TESTAPR)
    ENDIF()
  
    ADD_EXECUTABLE(testapp test/testapp.c)

 
   FOREACH(simple ${simple_tests})
     ADD_TEST(NAME ${simple} COMMAND ${simple})
@@ -370,9 +502,9 @@ IF(APR_BUILD_TESTAPR)
   # testlockperf takes forever on Windows with default counter limit
   ADD_TEST(NAME testlockperf COMMAND testlockperf -c 50000)
 

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 75f35c7..ba6de6a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -19,13 +19,20 @@ PROJECT(APR C)
