mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-30 07:57:55 +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>
39 lines
1.3 KiB
Diff
39 lines
1.3 KiB
Diff
diff --git a/src/mdl/jit/llvm/CMakeLists.txt b/src/mdl/jit/llvm/CMakeLists.txt
|
|
index 70f7f50..13857be 100644
|
|
--- a/src/mdl/jit/llvm/CMakeLists.txt
|
|
+++ b/src/mdl/jit/llvm/CMakeLists.txt
|
|
@@ -289,11 +289,16 @@ endforeach()
|
|
|
|
# -------------------------------------------------------------------------------------------------
|
|
# set options for all other projects that are build in addition to the libs we need
|
|
-set(ADDITIONAL_LLVM_TARGETS
|
|
- obj.llvm-tblgen
|
|
- llvm-tblgen
|
|
+set(ADDITIONAL_LLVM_TARGETS
|
|
+ llvm-tblgen
|
|
)
|
|
|
|
+
|
|
+# LLVM_ENABLE_OBJLIB cf. dist\cmake\modules\TableGen.cmake:125
|
|
+if(NOT (CMAKE_GENERATOR STREQUAL "Ninja" AND NOT CMAKE_VERSION VERSION_LESS 3.9) AND NOT XCODE)
|
|
+ list(APPEND ADDITIONAL_LLVM_TARGETS obj.llvm-tblgen)
|
|
+endif()
|
|
+
|
|
foreach(_ADD_LLVM ${ADDITIONAL_LLVM_TARGETS})
|
|
message(STATUS "setting flags for ${_ADD_LLVM}")
|
|
llvm_target_setup(TARGET ${_ADD_LLVM})
|
|
@@ -360,9 +365,10 @@ if(WINDOWS)
|
|
)
|
|
endif()
|
|
|
|
- set(_LLVM_EXCLUDE ${_LLVM_EXCLUDE}
|
|
- LLVMVisualizers
|
|
- )
|
|
+ # LLVM_ADD_NATIVE_VISUALIZERS_TO_SOLUTION cf. dist\CMakeLists.txt:559
|
|
+ if (MSVC_IDE AND NOT (MSVC_VERSION LESS 1900))
|
|
+ list(APPEND _LLVM_EXCLUDE LLVMVisualizers)
|
|
+ endif()
|
|
endif()
|
|
|
|
|