From 908b5e1de730df19994c831f3fde9b7a5c1d5242 Mon Sep 17 00:00:00 2001 From: Brad Hefta-Gaub Date: Fri, 10 Jan 2014 22:38:16 -0800 Subject: [PATCH] hack test externals --- assignment-client/CMakeLists.txt | 2 +- domain-server/CMakeLists.txt | 6 +++--- libraries/octree-server/CMakeLists.txt | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/assignment-client/CMakeLists.txt b/assignment-client/CMakeLists.txt index 32d069ca23..90a21566da 100644 --- a/assignment-client/CMakeLists.txt +++ b/assignment-client/CMakeLists.txt @@ -36,7 +36,7 @@ link_hifi_library(voxel-server ${TARGET_NAME} ${ROOT_DIR}) link_hifi_library(script-engine ${TARGET_NAME} ${ROOT_DIR}) #testing -include_directories(${ROOT_DIR}/externals/civetweb/include) +#include_directories(${ROOT_DIR}/externals/civetweb/include) if (UNIX) target_link_libraries(${TARGET_NAME} ${CMAKE_DL_LIBS}) diff --git a/domain-server/CMakeLists.txt b/domain-server/CMakeLists.txt index 8a1a6a26dd..ed0069deed 100644 --- a/domain-server/CMakeLists.txt +++ b/domain-server/CMakeLists.txt @@ -14,12 +14,12 @@ include_glm(${TARGET_NAME} ${ROOT_DIR}) include(${MACRO_DIR}/SetupHifiProject.cmake) -# grab cJSON and civetweb sources to pass as OPTIONAL_SRCS -FILE(GLOB OPTIONAL_SRCS ${ROOT_DIR}/externals/civetweb/src/*) +# 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}) -include_directories(${ROOT_DIR}/externals/civetweb/include) +#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 diff --git a/libraries/octree-server/CMakeLists.txt b/libraries/octree-server/CMakeLists.txt index 930c91018c..1cdd74d54e 100644 --- a/libraries/octree-server/CMakeLists.txt +++ b/libraries/octree-server/CMakeLists.txt @@ -13,11 +13,11 @@ find_package(Qt5Widgets REQUIRED) include(${MACRO_DIR}/SetupHifiLibrary.cmake) # grab cJSON and civetweb sources to pass as OPTIONAL_SRCS -FILE(GLOB OPTIONAL_SRCS ${ROOT_DIR}/externals/civetweb/src/*) +#FILE(GLOB OPTIONAL_SRCS ${ROOT_DIR}/externals/civetweb/src/*) setup_hifi_library(${TARGET_NAME} ${OPTIONAL_SRCS}) -include_directories(${ROOT_DIR}/externals/civetweb/include) +#include_directories(${ROOT_DIR}/externals/civetweb/include) qt5_use_modules(${TARGET_NAME} Widgets)