move model-baking library to oven for build exclusion

libraries/model-baking/CMakeLists.txt

@@ -1,15 +0,0 @@
-set(TARGET_NAME model-baking)
-
-setup_hifi_library(Concurrent)
-
-link_hifi_libraries(networking image gpu shared ktx)
-
-# try to find the FBX SDK but fail silently if we don't
-# because this library is not built by default
-find_package(FBX)
-if (FBX_FOUND)
-  target_link_libraries(${TARGET_NAME} ${FBX_LIBRARIES})
-  target_include_directories(${TARGET_NAME} SYSTEM PRIVATE ${FBX_INCLUDE_DIR})
-endif ()
-
-set_target_properties(${TARGET_NAME} PROPERTIES EXCLUDE_FROM_ALL TRUE EXCLUDE_FROM_DEFAULT_BUILD TRUE)

tools/oven/CMakeLists.txt

@@ -2,14 +2,18 @@ set(TARGET_NAME oven)
 
 setup_hifi_project(Widgets Gui Concurrent)
 
-link_hifi_libraries(model-baking shared image gpu ktx)
+link_hifi_libraries(networking shared image gpu ktx)
 
 if (WIN32)
   package_libraries_for_deployment()
 endif ()
 
-set_target_properties(${TARGET_NAME} PROPERTIES EXCLUDE_FROM_ALL TRUE EXCLUDE_FROM_DEFAULT_BUILD TRUE)
+# try to find the FBX SDK but fail silently if we don't
+# because this tool is not built by default
+find_package(FBX)
+if (FBX_FOUND)
+  target_link_libraries(${TARGET_NAME} ${FBX_LIBRARIES})
+  target_include_directories(${TARGET_NAME} SYSTEM PRIVATE ${FBX_INCLUDE_DIR})
+endif ()
 
-# because the model-baking library is excluded from all and default builds, we force
-# a dependency on it here
-add_dependencies(${TARGET_NAME} model-baking)
+set_target_properties(${TARGET_NAME} PROPERTIES EXCLUDE_FROM_ALL TRUE EXCLUDE_FROM_DEFAULT_BUILD TRUE)

tools/oven/src/DomainBaker.h

@@ -17,9 +17,9 @@
 #include <QtCore/QUrl>
 #include <QtCore/QThread>
 
-#include <Baker.h>
-#include <FBXBaker.h>
-#include <TextureBaker.h>
+#include "Baker.h"
+#include "FBXBaker.h"
+#include "TextureBaker.h"
 
 class DomainBaker : public Baker {
     Q_OBJECT

tools/oven/src/ui/BakeWidget.h

@@ -14,7 +14,7 @@
 
 #include <QtWidgets/QWidget>
 
-#include <Baker.h>
+#include "../Baker.h"
 
 class BakeWidget : public QWidget {
     Q_OBJECT

tools/oven/src/ui/ModelBakeWidget.h

@@ -16,7 +16,7 @@
 
 #include <SettingHandle.h>
 
-#include <FBXBaker.h>
+#include "../FBXBaker.h"
 
 #include "BakeWidget.h"
 

tools/oven/src/ui/SkyboxBakeWidget.h

@@ -16,7 +16,7 @@
 
 #include <SettingHandle.h>
 
-#include <TextureBaker.h>
+#include "../TextureBaker.h"
 
 #include "BakeWidget.h"