From c5e10465c4e4768fc459be25601a21bf6cbf44ac Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Thu, 16 Jan 2014 17:08:06 -0800 Subject: [PATCH] don't include civetweb in DomainServer --- domain-server/CMakeLists.txt | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-) diff --git a/domain-server/CMakeLists.txt b/domain-server/CMakeLists.txt index d9bd04e9b5..213b37ac16 100644 --- a/domain-server/CMakeLists.txt +++ b/domain-server/CMakeLists.txt @@ -16,15 +16,10 @@ find_package(Qt5Network REQUIRED) include(${MACRO_DIR}/SetupHifiProject.cmake) -# grab cJSON and civetweb sources to pass as OPTIONAL_SRCS -FILE(GLOB OPTIONAL_SRCS ${ROOT_DIR}/externals/civetweb/src/*) - -setup_hifi_project(${TARGET_NAME} TRUE ${OPTIONAL_SRCS}) +setup_hifi_project(${TARGET_NAME} TRUE) qt5_use_modules(${TARGET_NAME} Network) -include_directories(SYSTEM ${ROOT_DIR}/externals/civetweb/include) - # remove and then copy the files for the webserver add_custom_command(TARGET ${TARGET_NAME} POST_BUILD COMMAND ${CMAKE_COMMAND} -E remove_directory @@ -37,13 +32,4 @@ add_custom_command(TARGET ${TARGET_NAME} POST_BUILD # link the shared hifi library include(${MACRO_DIR}/LinkHifiLibrary.cmake) link_hifi_library(shared ${TARGET_NAME} ${ROOT_DIR}) -link_hifi_library(embedded-webserver ${TARGET_NAME} ${ROOT_DIR}) - -# link dl library on UNIX for civetweb -if (UNIX AND NOT APPLE) - target_link_libraries(${TARGET_NAME} ${CMAKE_DL_LIBS}) -endif (UNIX AND NOT APPLE) - -IF (WIN32) - target_link_libraries(${TARGET_NAME} Winmm) -ENDIF(WIN32) +link_hifi_library(embedded-webserver ${TARGET_NAME} ${ROOT_DIR}) \ No newline at end of file