diff --git a/libraries/models/CMakeLists.txt b/libraries/models/CMakeLists.txt index 5bd02714d2..062352e50c 100644 --- a/libraries/models/CMakeLists.txt +++ b/libraries/models/CMakeLists.txt @@ -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) diff --git a/libraries/models/src/ModelItem.cpp b/libraries/models/src/ModelItem.cpp index 2ebff1137a..605b5b209e 100644 --- a/libraries/models/src/ModelItem.cpp +++ b/libraries/models/src/ModelItem.cpp @@ -1348,3 +1348,4 @@ void ModelItemIDfromScriptValue(const QScriptValue &object, ModelItemID& id) { } + diff --git a/libraries/models/src/ModelItem.h b/libraries/models/src/ModelItem.h index d691a4e98b..c03dcd51d2 100644 --- a/libraries/models/src/ModelItem.h +++ b/libraries/models/src/ModelItem.h @@ -357,6 +357,4 @@ protected: static std::map _tokenIDsToIDs; }; - - #endif // hifi_ModelItem_h