added cmake support for STREAMABLE

This commit is contained in:
ZappoMan 2014-04-30 13:48:09 -07:00
parent 0182a6d895
commit be3d307b27
3 changed files with 8 additions and 3 deletions

View file

@ -14,8 +14,11 @@ set(TARGET_NAME models)
find_package(Qt5Widgets REQUIRED)
include(${MACRO_DIR}/AutoMTC.cmake)
auto_mtc(${TARGET_NAME} "${ROOT_DIR}")
include(${MACRO_DIR}/SetupHifiLibrary.cmake)
setup_hifi_library(${TARGET_NAME})
setup_hifi_library(${TARGET_NAME} "${AUTOMTC_SRC}")
include(${MACRO_DIR}/IncludeGLM.cmake)
include_glm(${TARGET_NAME} "${ROOT_DIR}")
@ -26,6 +29,9 @@ link_hifi_library(octree ${TARGET_NAME} "${ROOT_DIR}")
link_hifi_library(fbx ${TARGET_NAME} "${ROOT_DIR}")
link_hifi_library(networking ${TARGET_NAME} "${ROOT_DIR}")
# for streamable
link_hifi_library(metavoxels ${TARGET_NAME} "${ROOT_DIR}")
# link ZLIB and GnuTLS
find_package(ZLIB)
find_package(GnuTLS REQUIRED)

View file

@ -1348,3 +1348,4 @@ void ModelItemIDfromScriptValue(const QScriptValue &object, ModelItemID& id) {
}

View file

@ -357,6 +357,4 @@ protected:
static std::map<uint32_t,uint32_t> _tokenIDsToIDs;
};
#endif // hifi_ModelItem_h