Merge branch 'master' into moredocs

This commit is contained in:
Farook Al-Sammarraie 2020-11-19 01:18:12 +03:00 committed by GitHub
commit 896ec0621b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 5 deletions

View File

@ -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)

View File

@ -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)

View File

@ -1,4 +1,4 @@
#include "../build/crow_all.h" #include "crow_all.h"
#include <sstream> #include <sstream>