From 38cb998ca15eb5fac13613968703ec3531df759b Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Thu, 20 Apr 2017 11:14:15 -0700 Subject: [PATCH] move model-baking library to oven for build exclusion --- libraries/model-baking/CMakeLists.txt | 15 --------------- tools/oven/CMakeLists.txt | 14 +++++++++----- .../model-baking => tools/oven}/src/Baker.cpp | 0 .../model-baking => tools/oven}/src/Baker.h | 0 tools/oven/src/DomainBaker.h | 6 +++--- .../model-baking => tools/oven}/src/FBXBaker.cpp | 0 .../model-baking => tools/oven}/src/FBXBaker.h | 0 .../oven}/src/ModelBakingLoggingCategory.cpp | 0 .../oven}/src/ModelBakingLoggingCategory.h | 0 .../oven}/src/TextureBaker.cpp | 0 .../oven}/src/TextureBaker.h | 0 tools/oven/src/ui/BakeWidget.h | 2 +- tools/oven/src/ui/ModelBakeWidget.h | 2 +- tools/oven/src/ui/SkyboxBakeWidget.h | 2 +- 14 files changed, 15 insertions(+), 26 deletions(-) delete mode 100644 libraries/model-baking/CMakeLists.txt rename {libraries/model-baking => tools/oven}/src/Baker.cpp (100%) rename {libraries/model-baking => tools/oven}/src/Baker.h (100%) rename {libraries/model-baking => tools/oven}/src/FBXBaker.cpp (100%) rename {libraries/model-baking => tools/oven}/src/FBXBaker.h (100%) rename {libraries/model-baking => tools/oven}/src/ModelBakingLoggingCategory.cpp (100%) rename {libraries/model-baking => tools/oven}/src/ModelBakingLoggingCategory.h (100%) rename {libraries/model-baking => tools/oven}/src/TextureBaker.cpp (100%) rename {libraries/model-baking => tools/oven}/src/TextureBaker.h (100%) diff --git a/libraries/model-baking/CMakeLists.txt b/libraries/model-baking/CMakeLists.txt deleted file mode 100644 index b3698270d7..0000000000 --- a/libraries/model-baking/CMakeLists.txt +++ /dev/null @@ -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) diff --git a/tools/oven/CMakeLists.txt b/tools/oven/CMakeLists.txt index 10e2923e35..24c8a9a0e2 100644 --- a/tools/oven/CMakeLists.txt +++ b/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) diff --git a/libraries/model-baking/src/Baker.cpp b/tools/oven/src/Baker.cpp similarity index 100% rename from libraries/model-baking/src/Baker.cpp rename to tools/oven/src/Baker.cpp diff --git a/libraries/model-baking/src/Baker.h b/tools/oven/src/Baker.h similarity index 100% rename from libraries/model-baking/src/Baker.h rename to tools/oven/src/Baker.h diff --git a/tools/oven/src/DomainBaker.h b/tools/oven/src/DomainBaker.h index 54cbb18b06..5244408115 100644 --- a/tools/oven/src/DomainBaker.h +++ b/tools/oven/src/DomainBaker.h @@ -17,9 +17,9 @@ #include #include -#include -#include -#include +#include "Baker.h" +#include "FBXBaker.h" +#include "TextureBaker.h" class DomainBaker : public Baker { Q_OBJECT diff --git a/libraries/model-baking/src/FBXBaker.cpp b/tools/oven/src/FBXBaker.cpp similarity index 100% rename from libraries/model-baking/src/FBXBaker.cpp rename to tools/oven/src/FBXBaker.cpp diff --git a/libraries/model-baking/src/FBXBaker.h b/tools/oven/src/FBXBaker.h similarity index 100% rename from libraries/model-baking/src/FBXBaker.h rename to tools/oven/src/FBXBaker.h diff --git a/libraries/model-baking/src/ModelBakingLoggingCategory.cpp b/tools/oven/src/ModelBakingLoggingCategory.cpp similarity index 100% rename from libraries/model-baking/src/ModelBakingLoggingCategory.cpp rename to tools/oven/src/ModelBakingLoggingCategory.cpp diff --git a/libraries/model-baking/src/ModelBakingLoggingCategory.h b/tools/oven/src/ModelBakingLoggingCategory.h similarity index 100% rename from libraries/model-baking/src/ModelBakingLoggingCategory.h rename to tools/oven/src/ModelBakingLoggingCategory.h diff --git a/libraries/model-baking/src/TextureBaker.cpp b/tools/oven/src/TextureBaker.cpp similarity index 100% rename from libraries/model-baking/src/TextureBaker.cpp rename to tools/oven/src/TextureBaker.cpp diff --git a/libraries/model-baking/src/TextureBaker.h b/tools/oven/src/TextureBaker.h similarity index 100% rename from libraries/model-baking/src/TextureBaker.h rename to tools/oven/src/TextureBaker.h diff --git a/tools/oven/src/ui/BakeWidget.h b/tools/oven/src/ui/BakeWidget.h index 00996128ed..e7ab8d1840 100644 --- a/tools/oven/src/ui/BakeWidget.h +++ b/tools/oven/src/ui/BakeWidget.h @@ -14,7 +14,7 @@ #include -#include +#include "../Baker.h" class BakeWidget : public QWidget { Q_OBJECT diff --git a/tools/oven/src/ui/ModelBakeWidget.h b/tools/oven/src/ui/ModelBakeWidget.h index b42b8725f6..ed08990ba5 100644 --- a/tools/oven/src/ui/ModelBakeWidget.h +++ b/tools/oven/src/ui/ModelBakeWidget.h @@ -16,7 +16,7 @@ #include -#include +#include "../FBXBaker.h" #include "BakeWidget.h" diff --git a/tools/oven/src/ui/SkyboxBakeWidget.h b/tools/oven/src/ui/SkyboxBakeWidget.h index f00ab07f33..4063a5459b 100644 --- a/tools/oven/src/ui/SkyboxBakeWidget.h +++ b/tools/oven/src/ui/SkyboxBakeWidget.h @@ -16,7 +16,7 @@ #include -#include +#include "../TextureBaker.h" #include "BakeWidget.h"