    IF(apiflag)
      SET_TARGET_PROPERTIES(mod_test PROPERTIES COMPILE_FLAGS ${apiflag})
    ENDIF()
-@@ -333,7 +466,7 @@ IF(APR_BUILD_TESTAPR)
-   # requirements.
-   SET(single_source_programs
-     test/echod.c
--    test/sendfile.c
-+    test/sendfiletest.c
-     test/sockperf.c
-     test/testlockperf.c
-     test/testmutexscope.c
 @@ -345,8 +478,10 @@ IF(APR_BUILD_TESTAPR)
      test/testshmproducer.c
      test/testshmconsumer.c

 
   FOREACH(simple ${simple_tests})
     ADD_TEST(NAME ${simple} COMMAND ${simple})
@@ -370,9 +508,9 @@ IF(APR_BUILD_TESTAPR)
   # testlockperf takes forever on Windows with default counter limit
   ADD_TEST(NAME testlockperf COMMAND testlockperf -c 50000)
 
-  # sendfile runs multiple times with different parameters.
+  # sendfiletest runs multiple times with different parameters.
   FOREACH(sendfile_mode blocking nonblocking timeout)
-    ADD_TEST(NAME sendfile-${sendfile_mode} COMMAND sendfile client ${sendfile_mode} startserver)
+    ADD_TEST(NAME sendfiletest-${sendfile_mode} COMMAND sendfiletest client ${sendfile_mode} startserver)
   ENDFOREACH()
 
   # No test is added for echod+sockperf.  Those will have to be run manually.
@@ -381,11 +519,16 @@ ENDIF (APR_BUILD_TESTAPR)
 
 # Installation

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