Mirrors/overte-thingvellir
3
0
Fork 0
mirror of https://thingvellir.net/git/overte synced 2025-03-27 23:52:03 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

try to get this to work

Browse source
This commit is contained in:
Brad Hefta-Gaub 2014-01-10 22:58:32 -08:00
parent 908b5e1de7
commit 7234b9ca4a
3 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cmake/macros/IncludeGLM.cmake
View file

@ -2,5 +2,7 @@ MACRO(INCLUDE_GLM TARGET ROOT_DIR)
set(GLM_ROOT_DIR ${ROOT_DIR}/externals) set(GLM_ROOT_DIR ${ROOT_DIR}/externals)
find_package(GLM REQUIRED) find_package(GLM REQUIRED)
include_directories(${GLM_INCLUDE_DIRS}) include_directories(${GLM_INCLUDE_DIRS})
IF(APPLE OR UNIX)
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -isystem ${GLM_INCLUDE_DIRS}") SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -isystem ${GLM_INCLUDE_DIRS}")
ENDIF(APPLE OR UNIX)
ENDMACRO(INCLUDE_GLM _target _root_dir) ENDMACRO(INCLUDE_GLM _target _root_dir)

4
domain-server/CMakeLists.txt
View file

@ -15,11 +15,11 @@ include_glm(${TARGET_NAME} ${ROOT_DIR})
include(${MACRO_DIR}/SetupHifiProject.cmake) include(${MACRO_DIR}/SetupHifiProject.cmake)
# grab cJSON and civetweb sources to pass as OPTIONAL_SRCS # 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}) 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 # remove and then copy the files for the webserver
add_custom_command(TARGET ${TARGET_NAME} POST_BUILD add_custom_command(TARGET ${TARGET_NAME} POST_BUILD

4
libraries/octree-server/CMakeLists.txt
View file

@ -13,11 +13,11 @@ find_package(Qt5Widgets REQUIRED)
include(${MACRO_DIR}/SetupHifiLibrary.cmake) include(${MACRO_DIR}/SetupHifiLibrary.cmake)
# grab cJSON and civetweb sources to pass as OPTIONAL_SRCS # 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}) 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) qt5_use_modules(${TARGET_NAME} Widgets)