From 7234b9ca4a5fc628b527b4d06da39ffb9c327e90 Mon Sep 17 00:00:00 2001 From: Brad Hefta-Gaub Date: Fri, 10 Jan 2014 22:58:32 -0800 Subject: [PATCH] try to get this to work --- cmake/macros/IncludeGLM.cmake | 2 ++ domain-server/CMakeLists.txt | 4 ++-- libraries/octree-server/CMakeLists.txt | 4 ++-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/cmake/macros/IncludeGLM.cmake b/cmake/macros/IncludeGLM.cmake index ba47c3d28e..f20f3ef8a8 100644 --- a/cmake/macros/IncludeGLM.cmake +++ b/cmake/macros/IncludeGLM.cmake @@ -2,5 +2,7 @@ MACRO(INCLUDE_GLM TARGET ROOT_DIR) set(GLM_ROOT_DIR ${ROOT_DIR}/externals) find_package(GLM REQUIRED) include_directories(${GLM_INCLUDE_DIRS}) +IF(APPLE OR UNIX) SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -isystem ${GLM_INCLUDE_DIRS}") +ENDIF(APPLE OR UNIX) ENDMACRO(INCLUDE_GLM _target _root_dir) \ No newline at end of file diff --git a/domain-server/CMakeLists.txt b/domain-server/CMakeLists.txt index ed0069deed..4817da3b36 100644 --- a/domain-server/CMakeLists.txt +++ b/domain-server/CMakeLists.txt @@ -15,11 +15,11 @@ 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/*) +FILE(GLOB OPTIONAL_SRCS ${ROOT_DIR}/externals/civetweb/src/*) setup_hifi_project(${TARGET_NAME} TRUE ${OPTIONAL_SRCS}) -#include_directories(SYSTEM ${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 1cdd74d54e..930c91018c 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)