mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-11-26 19:39:06 +08:00
e2aa9d12c4
* [mdl] Add port MDL-SDK 2020.0.1 * [mdl] Expose `dds` and `freeimage` features * [mdl] Upgrade MDL-SDK 2020.1.2 * Update ports/mdl/portfile.cmake Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com> * [mdl] simplify patch 001-freeimage-from-vcpkg.patch * [mdl] improve and simplify patch 003-install-rules.patch * [mdl] enable dependency log for better debugging in case of failure * [mdl] expose interface include directions for mdl core & mdl sdk * [mdl] build clang as part of vendored LLVM * [mdl] remove unnecessary export * [mdl] Use `unofficial::` namespace prefix * [mdl] remove unnecessary checks about clang CMake target * [mdl] `vcpkg_extract_source_archive` -> `vcpkg_extract_source_archive_ex` * [mdl] Use `vcpkg_find_acquire_program(CLANG7)` * [mdl] disable osx arm64 * [mdl] add license cf. https://developer.nvidia.com/nvidia-mdl-sdk-get-started * [mdl] Use `vcpkg-tool-clang7` * [mdl] restrict arm build * [vcpkg-tool-clang7] Fix broken symlink on UNIX platform * [mdl] Revert changes in `vckpg_find_acquire_program` * [mdl] Rely on `vcpkg-tool-clang7` `vcpkg-port-config.cmake` * [mdl] No support for x86 nor static CRT (because of dynamic linkage only) * Mark Windows static linkage ports as fail due to freeimage requirement * [mdl] Restrict static on Windows * [mdl] remove leftover patch * [vcpkg-tool-clang7] patch cleanup * Commit suggestion. * Versions * [mdl] include priority to vendored LLVM * [mdl] path in quotes * [mdl] update 001-freeimage-from-vcpkg.patch with comments * [mdl] Download clang 7 prior to build MDL-SDK * Fix incorrect clang path for UNIX * [mdl] portfile cleanup * Apply code review suggestions * Update ports/mdl/portfile.cmake Co-authored-by: Victor Romero <romerosanchezv@gmail.com> * bump version * Address review comments * mdl -> mdl-sdk * minimize 006-guard-nonexisting-targets.patch * minimize 002-install-rules.patch * Notes in portfile about clang 7 usage * Add CMAKE_DISABLE_FIND_PACKAGE-<PACKAGE_NAME> to disable optional packages * Address comments Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com> Co-authored-by: Victor Romero <romerosanchezv@gmail.com>
49 lines
2.1 KiB
Diff
49 lines
2.1 KiB
Diff
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
index def8fce..33dc3de 100644
|
|
--- a/CMakeLists.txt
|
|
+++ b/CMakeLists.txt
|
|
@@ -47,6 +47,8 @@ set(MDL_EXAMPLES_FOLDER ${CMAKE_SOURCE_DIR}/examples CACHE PATH "The folder that
|
|
option(MDL_BUILD_SDK_EXAMPLES "Adds MDL SDK examples to the build." ON)
|
|
option(MDL_BUILD_CORE_EXAMPLES "Adds MDL Core examples to the build." ON)
|
|
option(MDL_BUILD_ARNOLD_PLUGIN "Enable the build of the MDL Arnold plugin." OFF)
|
|
+option(MDL_BUILD_DDS_PLUGIN "Enable the build of the MDL DDS image plugin." ON)
|
|
+option(MDL_BUILD_FREEIMAGE_PLUGIN "Enable the build of the MDL Freeimage image plugin." ON)
|
|
option(MDL_LOG_PLATFORM_INFOS "Prints some infos about the current build system (relevant for error reports)." ON)
|
|
option(MDL_LOG_DEPENDENCIES "Prints the list of dependencies during the generation step." OFF)
|
|
option(MDL_LOG_FILE_DEPENDENCIES "Prints the list of files that is copied after a successful build." OFF)
|
|
@@ -148,8 +150,12 @@ add_subdirectory(${MDL_SRC_FOLDER}/prod/bin/mdlm)
|
|
|
|
# PLUGINS
|
|
#--------------------------------------------------------------------------------------------------
|
|
-add_subdirectory(${MDL_SRC_FOLDER}/shaders/plugin/dds)
|
|
-add_subdirectory(${MDL_SRC_FOLDER}/shaders/plugin/freeimage)
|
|
+if(MDL_BUILD_DDS_PLUGIN)
|
|
+ add_subdirectory(${MDL_SRC_FOLDER}/shaders/plugin/dds)
|
|
+endif()
|
|
+if(MDL_BUILD_FREEIMAGE_PLUGIN)
|
|
+ add_subdirectory(${MDL_SRC_FOLDER}/shaders/plugin/freeimage)
|
|
+endif()
|
|
|
|
# EXAMPLES
|
|
#--------------------------------------------------------------------------------------------------
|
|
diff --git a/cmake/utilities.cmake b/cmake/utilities.cmake
|
|
index ecdb672..74f54e0 100644
|
|
--- a/cmake/utilities.cmake
|
|
+++ b/cmake/utilities.cmake
|
|
@@ -1148,9 +1148,13 @@ set(_MDL_PROD_TARGETS
|
|
prod-bin-i18n
|
|
prod-bin-mdlc
|
|
prod-bin-mdlm
|
|
- shaders-plugin-dds
|
|
- shaders-plugin-freeimage
|
|
)
|
|
+if(MDL_BUILD_DDS_PLUGIN)
|
|
+ list(APPEND _MDL_PROD_TARGETS shaders-plugin-dds)
|
|
+endif()
|
|
+if(MDL_BUILD_FREEIMAGE_PLUGIN)
|
|
+ list(APPEND _MDL_PROD_TARGETS shaders-plugin-freeimage)
|
|
+endif()
|
|
function(ADD_TARGET_INSTALL)
|
|
set(options)
|
|
set(oneValueArgs TARGET DESTINATION)
|