diff options
| author | Antony Woods <acron1@gmail.com> | 2014-10-02 17:35:05 +0100 |
|---|---|---|
| committer | Antony Woods <acron1@gmail.com> | 2014-10-02 17:35:05 +0100 |
| commit | a8f6c5a92fea5439b4a0372ccc3b367e3c3bed3b (patch) | |
| tree | 9a84a88649ae635b413b853cd0694382c1fa814a /CMakeLists.txt | |
| parent | 6890436742c89a01d00f26f796becb5e81c26e0b (diff) | |
| parent | d496f0f4b5a4f154ffdb89896d8de155a002c393 (diff) | |
| download | crow-a8f6c5a92fea5439b4a0372ccc3b367e3c3bed3b.tar.gz crow-a8f6c5a92fea5439b4a0372ccc3b367e3c3bed3b.zip | |
Merge branch 'master' of github.com:acron0/crow into url-params-in-req
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index ce97cd9..59ec4c8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -15,7 +15,6 @@ include_directories( ${Boost_INCLUDE_DIR} ) set(PROJECT_INCLUDE_DIR ${PROJECT_SOURCE_DIR}/include -${PROJECT_SOURCE_DIR}/http-parser ) include_directories("${PROJECT_INCLUDE_DIR}") @@ -30,13 +29,12 @@ add_test(NAME crow_test COMMAND ${CMAKE_CURRENT_BINARY_DIR}/tests/unittest) add_test(NAME template_test COMMAND ${CMAKE_CURRENT_BINARY_DIR}/tests/template/test.py WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/tests/template) file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/amalgamate) -add_custom_target(amalgamation ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/amalgamate/crow_all.h) -file(COPY DIRECTORY ${PROJECT_SOURCE_DIR}/include DESTINATION ${CMAKE_CURRENT_BINARY_DIR} - FILES_MATCHING - PATTERN "*.h") -add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/amalgamate/crow_all.h - COMMAND python ${PROJECT_SOURCE_DIR}/amalgamate/merge_all.py +add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/amalgamate/crow_all.h + COMMAND python ${PROJECT_SOURCE_DIR}/amalgamate/merge_all.py ${PROJECT_SOURCE_DIR}/include + COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_BINARY_DIR}/amalgamate/crow_all.h ${PROJECT_SOURCE_DIR}/amalgamate WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/amalgamate + DEPENDS ${PROJECT_SOURCE_DIR}/include/*.h ) +add_custom_target(amalgamation ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/amalgamate/crow_all.h) |