mirror of
https://github.com/CrowCpp/Crow.git
synced 2024-06-07 21:10:44 +00:00
Merge branch 'master' into moredocs
This commit is contained in:
commit
896ec0621b
@ -41,6 +41,7 @@ set(PROJECT_INCLUDE_DIR
|
|||||||
|
|
||||||
include_directories("${PROJECT_INCLUDE_DIR}")
|
include_directories("${PROJECT_INCLUDE_DIR}")
|
||||||
include_directories("${PROJECT_SOURCE_DIR}")
|
include_directories("${PROJECT_SOURCE_DIR}")
|
||||||
|
include_directories("${CMAKE_CURRENT_BINARY_DIR}") # To include crow_all.h
|
||||||
|
|
||||||
add_subdirectory(examples)
|
add_subdirectory(examples)
|
||||||
|
|
||||||
|
@ -26,12 +26,12 @@ add_custom_command(OUTPUT ws.html
|
|||||||
)
|
)
|
||||||
add_custom_target(example_ws_copy ALL DEPENDS ws.html)
|
add_custom_target(example_ws_copy ALL DEPENDS ws.html)
|
||||||
|
|
||||||
add_executable(example example.cpp)
|
add_executable(basic_example example.cpp)
|
||||||
target_link_libraries(example ${Boost_LIBRARIES})
|
target_link_libraries(basic_example ${Boost_LIBRARIES})
|
||||||
target_link_libraries(example ${CMAKE_THREAD_LIBS_INIT})
|
target_link_libraries(basic_example ${CMAKE_THREAD_LIBS_INIT})
|
||||||
|
|
||||||
if (Tcmalloc_FOUND)
|
if (Tcmalloc_FOUND)
|
||||||
target_link_libraries(example ${Tcmalloc_LIBRARIES})
|
target_link_libraries(basic_example ${Tcmalloc_LIBRARIES})
|
||||||
endif(Tcmalloc_FOUND)
|
endif(Tcmalloc_FOUND)
|
||||||
|
|
||||||
add_executable(example_with_all example_with_all.cpp)
|
add_executable(example_with_all example_with_all.cpp)
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
#include "../build/crow_all.h"
|
#include "crow_all.h"
|
||||||
|
|
||||||
#include <sstream>
|
#include <sstream>
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user