Merge #48: Move test/src/ files one level up

8b5259c Move test/src/ files one level up (Russell Yanofsky)

Pull request description:

  This will make `test/` directory structure consistent with new `example/` directory. I want the example structure to be as simple as possible, and there's no need for tests or examples to have separate `include/` and `src/` subdirectories when they aren't installing public headers to `/usr/include`.

  Also get rid of `BUILD_INTERFACE` cmake expressions in `mptest` target include directory list for the same reason. `mptest` isn't an installed library so it has no need for differentiated `BUILD_INTERFACE` and `INSTALL_INTERFACE` include lists (https://cmake.org/cmake/help/latest/command/target_include_directories.html).

Top commit has no ACKs.

Tree-SHA512: 38de237deb18afd076b8663e2b28aef23a4ebb10514e4dd69e763274ee38e14b4dd65687bc87765caf5f9ef5d66570e9ffb8101ac048052d20fba90641cceec9

Author: ryanofsky

README.md

@@ -25,7 +25,7 @@ basis in this library to construct the event-loop necessary to service IPC reque
 
 ## Example
 
-A simple interface description can be found at [test/src/mp/test/foo.capnp](test/src/mp/test/foo.capnp), implementation in [test/src/mp/test/foo.h](test/src/mp/test/foo.h), and usage in [test/src/mp/test/test.cpp](test/src/mp/test/test.cpp).
+A simple interface description can be found at [test/mp/test/foo.capnp](test/mp/test/foo.capnp), implementation in [test/mp/test/foo.h](test/mp/test/foo.h), and usage in [test/mp/test/test.cpp](test/mp/test/test.cpp).
 
 ## Future directions
 

test/CMakeLists.txt

@@ -17,38 +17,36 @@ add_custom_target(check COMMAND ${CMAKE_CTEST_COMMAND} DEPENDS tests)
 if(BUILD_TESTING AND TARGET CapnProto::kj-test)
   add_custom_command(
     OUTPUT
-      src/mp/test/foo.capnp.h
-      src/mp/test/foo.capnp.c++
-      src/mp/test/foo.capnp.proxy.h
-      src/mp/test/foo.capnp.proxy-server.c++
-      src/mp/test/foo.capnp.proxy-client.c++
-      src/mp/test/foo.capnp.proxy-types.c++
-      src/mp/test/foo.capnp.proxy-types.h
-    COMMAND mpgen "${CMAKE_CURRENT_SOURCE_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}/src" "${CMAKE_CURRENT_SOURCE_DIR}/src/mp/test/foo.capnp" "${CMAKE_SOURCE_DIR}/include" "${capnp_PREFIX}/include"
-    DEPENDS src/mp/test/foo.capnp mpgen
+      mp/test/foo.capnp.h
+      mp/test/foo.capnp.c++
+      mp/test/foo.capnp.proxy.h
+      mp/test/foo.capnp.proxy-server.c++
+      mp/test/foo.capnp.proxy-client.c++
+      mp/test/foo.capnp.proxy-types.c++
+      mp/test/foo.capnp.proxy-types.h
+    COMMAND mpgen "${CMAKE_CURRENT_SOURCE_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}/mp/test/foo.capnp" "${CMAKE_SOURCE_DIR}/include" "${capnp_PREFIX}/include"
+    DEPENDS mp/test/foo.capnp mpgen
   )
 
   set_property(SOURCE ${MP_PROXY_HDRS} PROPERTY GENERATED 1)
 
   add_executable(mptest
     ${MP_PROXY_HDRS}
-    src/mp/test/foo.capnp.h
-    src/mp/test/foo.capnp.c++
-    src/mp/test/foo.capnp.proxy.h
-    src/mp/test/foo.capnp.proxy-server.c++
-    src/mp/test/foo.capnp.proxy-client.c++
-    src/mp/test/foo.capnp.proxy-types.c++
-    src/mp/test/foo.capnp.proxy-types.h
-    src/mp/test/foo-types.h
-    src/mp/test/foo.h
-    src/mp/test/test.cpp
+    mp/test/foo.capnp.h
+    mp/test/foo.capnp.c++
+    mp/test/foo.capnp.proxy.h
+    mp/test/foo.capnp.proxy-server.c++
+    mp/test/foo.capnp.proxy-client.c++
+    mp/test/foo.capnp.proxy-types.c++
+    mp/test/foo.capnp.proxy-types.h
+    mp/test/foo-types.h
+    mp/test/foo.h
+    mp/test/test.cpp
   )
   target_include_directories(mptest PUBLIC
     ${CAPNP_INCLUDE_DIRECTORY}
-    $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/include>
-    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
-    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/src>
-    $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/src>
+    ${CMAKE_CURRENT_SOURCE_DIR}
+    ${CMAKE_CURRENT_BINARY_DIR}
   )
   target_link_libraries(mptest PRIVATE CapnProto::capnp)
   target_link_libraries(mptest PRIVATE CapnProto::capnp-rpc)