mirror of
https://github.com/microsoft/vcpkg.git
synced 2025-06-07 17:12:47 +08:00
[nvtt] Control CUDA dependency, fix linkage (#24888)
* Control CUDA dependency * Fix release build flags for MSVC * Update versions
This commit is contained in:
parent
8abb3a585c
commit
ee0d840e32
15
ports/nvtt/fix-release-flags.patch
Normal file
15
ports/nvtt/fix-release-flags.patch
Normal file
@ -0,0 +1,15 @@
|
|||||||
|
diff --git a/cmake/OptimalOptions.cmake b/cmake/OptimalOptions.cmake
|
||||||
|
index e4d5c56..eba8624 100644
|
||||||
|
--- a/cmake/OptimalOptions.cmake
|
||||||
|
+++ b/cmake/OptimalOptions.cmake
|
||||||
|
@@ -11,8 +11,8 @@ IF(MSVC)
|
||||||
|
# SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /arch:SSE2 /fp:fast")
|
||||||
|
|
||||||
|
# Optimization flags.
|
||||||
|
- SET(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS} /O2 /Ob2 /Oi /Ot /Oy /GL")
|
||||||
|
- SET(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS} /O2 /Ob2 /Oi /Ot /Oy /GL")
|
||||||
|
+ SET(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} /O2 /Ob2 /Oi /Ot /Oy /GL")
|
||||||
|
+ SET(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /O2 /Ob2 /Oi /Ot /Oy /GL")
|
||||||
|
SET(CMAKE_EXE_LINKER_FLAGS_RELEASE "${CMAKE_EXE_LINKER_FLAGS_RELEASE} /LTCG")
|
||||||
|
SET(CMAKE_SHARED_LINKER_FLAGS_RELEASE "${CMAKE_SHARED_LINKER_FLAGS_RELEASE} /LTCG")
|
||||||
|
SET(CMAKE_MODULE_LINKER_FLAGS_RELEASE "${CMAKE_MODULE_LINKER_FLAGS_RELEASE} /LTCG")
|
@ -15,18 +15,29 @@ vcpkg_from_github(
|
|||||||
add-compile-options-for-osx.patch
|
add-compile-options-for-osx.patch
|
||||||
skip-building-libsquish.patch
|
skip-building-libsquish.patch
|
||||||
fix-intrinsic-function.patch
|
fix-intrinsic-function.patch
|
||||||
|
fix-release-flags.patch
|
||||||
|
)
|
||||||
|
|
||||||
|
vcpkg_check_features(
|
||||||
|
OUT_FEATURE_OPTIONS FEATURE_OPTIONS
|
||||||
|
FEATURES
|
||||||
|
cuda CMAKE_REQUIRE_FIND_PACKAGE_CUDA
|
||||||
|
INVERTED_FEATURES
|
||||||
|
cuda CMAKE_DISABLE_FIND_PACKAGE_CUDA
|
||||||
)
|
)
|
||||||
|
|
||||||
vcpkg_cmake_configure(
|
vcpkg_cmake_configure(
|
||||||
SOURCE_PATH "${SOURCE_PATH}"
|
SOURCE_PATH "${SOURCE_PATH}"
|
||||||
OPTIONS
|
OPTIONS
|
||||||
-DNVTT_SHARED=0
|
-DNVTT_SHARED=0
|
||||||
|
${FEATURE_OPTIONS}
|
||||||
|
OPTIONS_DEBUG
|
||||||
-DCMAKE_DEBUG_POSTFIX=_d # required by OSG
|
-DCMAKE_DEBUG_POSTFIX=_d # required by OSG
|
||||||
)
|
)
|
||||||
|
|
||||||
vcpkg_cmake_install()
|
vcpkg_cmake_install()
|
||||||
|
|
||||||
if(VCPKG_LIBRARY_LINKAGE STREQUAL static)
|
if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
|
||||||
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin")
|
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin")
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
{
|
{
|
||||||
"name": "nvtt",
|
"name": "nvtt",
|
||||||
"version": "2.1.2",
|
"version": "2.1.2",
|
||||||
"port-version": 4,
|
"port-version": 5,
|
||||||
"description": "Texture processing tools with support for Direct3D 10 and 11 formats.",
|
"description": "Texture processing tools with support for Direct3D 10 and 11 formats.",
|
||||||
"homepage": "https://github.com/castano/nvidia-texture-tools",
|
"homepage": "https://github.com/castano/nvidia-texture-tools",
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
@ -12,5 +12,13 @@
|
|||||||
"name": "vcpkg-cmake",
|
"name": "vcpkg-cmake",
|
||||||
"host": true
|
"host": true
|
||||||
}
|
}
|
||||||
]
|
],
|
||||||
|
"features": {
|
||||||
|
"cuda": {
|
||||||
|
"description": "Enable CUDA support",
|
||||||
|
"dependencies": [
|
||||||
|
"cuda"
|
||||||
|
]
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
@ -4938,7 +4938,7 @@
|
|||||||
},
|
},
|
||||||
"nvtt": {
|
"nvtt": {
|
||||||
"baseline": "2.1.2",
|
"baseline": "2.1.2",
|
||||||
"port-version": 4
|
"port-version": 5
|
||||||
},
|
},
|
||||||
"oatpp": {
|
"oatpp": {
|
||||||
"baseline": "1.3.0",
|
"baseline": "1.3.0",
|
||||||
|
@ -1,5 +1,10 @@
|
|||||||
{
|
{
|
||||||
"versions": [
|
"versions": [
|
||||||
|
{
|
||||||
|
"git-tree": "b1a685fa7402dce13182820ddd1dce2c6126b69f",
|
||||||
|
"version": "2.1.2",
|
||||||
|
"port-version": 5
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"git-tree": "5889b2b68d1c3b13bf681c75e0b8347fff3d72fc",
|
"git-tree": "5889b2b68d1c3b13bf681c75e0b8347fff3d72fc",
|
||||||
"version": "2.1.2",
|
"version": "2.1.2",
|
||||||
|
Loading…
Reference in New Issue
Block a user