revise linkage of civetweb for both DS and VS

assignment-client/CMakeLists.txt

@@ -27,6 +27,8 @@ link_hifi_library(avatars ${TARGET_NAME} ${ROOT_DIR})
 link_hifi_library(voxels ${TARGET_NAME} ${ROOT_DIR})
 link_hifi_library(voxel-server-library ${TARGET_NAME} ${ROOT_DIR})
 
+include_directories(${ROOT_DIR}/externals/civetweb/include)
+
 # link the stk library
 set(STK_ROOT_DIR ${ROOT_DIR}/externals/stk)
 find_package(STK REQUIRED)

cmake/macros/SetupHifiLibrary.cmake

@@ -6,7 +6,7 @@ MACRO(SETUP_HIFI_LIBRARY TARGET)
     set(LIB_SRCS ${LIB_SRCS} ${WRAPPED_SRCS})
 
     # create a library and set the property so it can be referenced later
-    add_library(${TARGET} ${LIB_SRCS})
+    add_library(${TARGET} ${LIB_SRCS} ${ARGN})
     
     find_package(Qt5Core REQUIRED)
     qt5_use_modules(${TARGET} Core)

domain-server/CMakeLists.txt

@@ -8,11 +8,11 @@ set(TARGET_NAME domain-server)
 include(${MACRO_DIR}/SetupHifiProject.cmake)
 
 # grab cJSON and civetweb sources to pass as OPTIONAL_SRCS 
-FILE(GLOB OPTIONAL_SRCS external/civetweb/src/* external/cJSON/src/*)
+FILE(GLOB OPTIONAL_SRCS ${ROOT_DIR}/externals/civetweb/src/* external/cJSON/src/*)
 
 setup_hifi_project(${TARGET_NAME} TRUE ${OPTIONAL_SRCS})
 
-include_directories(external/civetweb/include external/cJSON/include)
+include_directories(${ROOT_DIR}/externals/civetweb/include external/cJSON/include)
 
 # remove and then copy the files for the webserver
 add_custom_command(TARGET ${TARGET_NAME} POST_BUILD

libraries/voxel-server-library/CMakeLists.txt

@@ -11,18 +11,19 @@ set(TARGET_NAME voxel-server-library)
 find_package(Qt5Widgets REQUIRED)
 
 include(${MACRO_DIR}/SetupHifiLibrary.cmake)
-setup_hifi_library(${TARGET_NAME})
+
+# grab cJSON and civetweb sources to pass as OPTIONAL_SRCS 
+FILE(GLOB OPTIONAL_SRCS ${ROOT_DIR}/externals/civetweb/src/*)
+
+setup_hifi_library(${TARGET_NAME} ${OPTIONAL_SRCS})
+
+include_directories(${ROOT_DIR}/externals/civetweb/include)
 
 qt5_use_modules(${TARGET_NAME} Widgets)
 
 include(${MACRO_DIR}/IncludeGLM.cmake)
 include_glm(${TARGET_NAME} ${ROOT_DIR})
 
-# setup a library for civetweb and link it to the voxel-server-library
-# this assumes that the domain-server cmake has already correctly set up the civetweb library
-include_directories(../../domain-server/external/civetweb/include)
-target_link_libraries(${TARGET_NAME} civetweb)
-
 include(${MACRO_DIR}/LinkHifiLibrary.cmake)
 link_hifi_library(shared ${TARGET_NAME} ${ROOT_DIR})
 

libraries/voxel-server-library/src/VoxelServer.h

@@ -10,14 +10,14 @@
 #ifndef __voxel_server__VoxelServer__
 #define __voxel_server__VoxelServer__
 
-#include "../../domain-server/external/civetweb/include/civetweb.h"
-
 #include <QStringList>
 #include <QtCore/QCoreApplication>
 
 #include <Assignment.h>
 #include <EnvironmentData.h>
 
+#include "civetweb.h"
+
 #include "NodeWatcher.h"
 #include "VoxelPersistThread.h"
 #include "VoxelSendThread.h"