refactor CML for src in vcxproj

fix #130

Author: vinniefalco

CMakeLists.txt

@@ -138,14 +138,16 @@ file(GLOB_RECURSE BOOST_HTTP_PROTO_HEADERS CONFIGURE_DEPENDS include/boost/*.hpp
 file(GLOB_RECURSE BOOST_HTTP_PROTO_SOURCES CONFIGURE_DEPENDS src/*.cpp src/*.hpp)
 file(GLOB_RECURSE BOOST_HTTP_PROTO_ZLIB_SOURCES CONFIGURE_DEPENDS src_zlib/*.cpp src_zlib/*.hpp)
 
-source_group(TREE ${CMAKE_CURRENT_SOURCE_DIR}/include/boost PREFIX "" FILES ${BOOST_HTTP_PROTO_HEADERS})
-source_group(TREE ${CMAKE_CURRENT_SOURCE_DIR}/src PREFIX "http_proto" FILES ${BOOST_HTTP_PROTO_SOURCES})
-source_group(TREE ${CMAKE_CURRENT_SOURCE_DIR}/src_zlib PREFIX "http_proto" FILES ${BOOST_HTTP_PROTO_ZLIB_SOURCES})
+source_group("" FILES "include/boost/http_proto.hpp" "build/Jamfile")
+source_group(TREE ${CMAKE_CURRENT_SOURCE_DIR}/include/boost/http_proto PREFIX "include" FILES ${BOOST_HTTP_PROTO_HEADERS})
+source_group(TREE ${CMAKE_CURRENT_SOURCE_DIR}/src PREFIX "src" FILES ${BOOST_HTTP_PROTO_SOURCES})
+source_group(TREE ${CMAKE_CURRENT_SOURCE_DIR}/src_zlib PREFIX "src" FILES ${BOOST_HTTP_PROTO_ZLIB_SOURCES})
 
-add_library(boost_http_proto ${BOOST_HTTP_PROTO_HEADERS} ${BOOST_HTTP_PROTO_SOURCES})
+add_library(boost_http_proto include/boost/http_proto.hpp build/Jamfile ${BOOST_HTTP_PROTO_HEADERS} ${BOOST_HTTP_PROTO_SOURCES})
 add_library(Boost::http_proto ALIAS boost_http_proto)
 target_compile_features(boost_http_proto PUBLIC cxx_constexpr)
 target_include_directories(boost_http_proto PUBLIC "${PROJECT_SOURCE_DIR}/include")
+target_include_directories(boost_http_proto PRIVATE "${PROJECT_SOURCE_DIR}")
 target_link_libraries(boost_http_proto PUBLIC ${BOOST_HTTP_PROTO_DEPENDENCIES})
 target_compile_definitions(boost_http_proto PUBLIC BOOST_HTTP_PROTO_NO_LIB)
 target_compile_definitions(boost_http_proto PRIVATE BOOST_HTTP_PROTO_SOURCE)
@@ -157,8 +159,10 @@ endif ()
 
 find_package(ZLIB)
 if (ZLIB_FOUND)
-    add_library(boost_http_proto_zlib ${BOOST_HTTP_PROTO_HEADERS} ${BOOST_HTTP_PROTO_ZLIB_SOURCES})
+    add_library(boost_http_proto_zlib build/Jamfile ${BOOST_HTTP_PROTO_HEADERS} ${BOOST_HTTP_PROTO_ZLIB_SOURCES})
     add_library(Boost::http_proto_zlib ALIAS boost_http_proto_zlib)
+    target_include_directories(boost_http_proto PUBLIC "${PROJECT_SOURCE_DIR}/include")
+    target_include_directories(boost_http_proto PRIVATE "${PROJECT_SOURCE_DIR}")
     target_link_libraries(boost_http_proto_zlib PUBLIC boost_http_proto)
     target_link_libraries(boost_http_proto_zlib PRIVATE ZLIB::ZLIB)
     target_compile_definitions(boost_http_proto_zlib PUBLIC BOOST_HTTP_PROTO_HAS_ZLIB)

build/Jamfile

@@ -44,6 +44,7 @@ lib boost_http_proto
    : requirements
      <library>/boost//buffers
      <library>/boost//url
+     <include>../
      <define>BOOST_HTTP_PROTO_SOURCE
    : usage-requirements
      <library>/boost//buffers
@@ -59,6 +60,7 @@ lib boost_http_proto_zlib
    : requirements
      <library>/boost/http_proto//boost_http_proto
      [ ac.check-library /zlib//zlib : <library>/zlib//zlib : <build>no ]
+     <include>../
      <define>BOOST_HTTP_PROTO_ZLIB_SOURCE
    : usage-requirements
      <library>/zlib//zlib

src/detail/filter.hpp

@@ -133,6 +133,6 @@ class BOOST_HTTP_PROTO_DECL
 } // http_proto
 } // boost
 
-#include "impl/filter.hpp"
+#include "src/detail/impl/filter.hpp"
 
 #endif

test/limits/CMakeLists.txt

@@ -14,6 +14,7 @@ source_group(TREE ${CMAKE_CURRENT_SOURCE_DIR} FILES limits.cpp Jamfile)
 source_group(TREE ${CMAKE_CURRENT_SOURCE_DIR}/../../../url/extra PREFIX "_extra" FILES ${TEST_MAIN})
 source_group(TREE ${CMAKE_CURRENT_SOURCE_DIR}/../../src PREFIX "_extra" FILES ${LIMITS_SOURCES})
 add_executable(boost_http_proto_limits limits.cpp Jamfile ${TEST_MAIN} ${LIMITS_SOURCES})
+target_include_directories(boost_http_proto_limits PRIVATE ../../)
 target_include_directories(boost_http_proto_limits PRIVATE ../../include ../../../url/extra ../../..)
 target_compile_definitions(boost_http_proto_limits PRIVATE
     BOOST_HTTP_PROTO_MAX_HEADER=20