Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[nvtt] install extra libraries used by OSG. #6611

Merged
merged 1 commit into from
May 24, 2019
+47 −2
Merged

[nvtt] install extra libraries used by OSG. #6611

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ports/nvtt/CONTROL
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
Source: nvtt
Version: 2.1.0-2
Version: 2.1.0-3
Description: Texture processing tools with support for Direct3D 10 and 11 formats.
14 changes: 14 additions & 0 deletions ports/nvtt/bc6h.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
diff --git a/src/bc6h/CMakeLists.txt b/src/bc6h/CMakeLists.txt
index 635e0f3a..f758df43 100644
--- a/src/bc6h/CMakeLists.txt
+++ b/src/bc6h/CMakeLists.txt
@@ -20,3 +20,8 @@ IF(NOT WIN32)
SET_TARGET_PROPERTIES(bc6h PROPERTIES COMPILE_FLAGS -fPIC)
ENDIF(CMAKE_COMPILER_IS_GNUCXX)
ENDIF(NOT WIN32)
+
+INSTALL(TARGETS bc6h
+ RUNTIME DESTINATION bin
+ LIBRARY DESTINATION lib
+ ARCHIVE DESTINATION lib/static)
\ No newline at end of file
14 changes: 14 additions & 0 deletions ports/nvtt/bc7.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
diff --git a/src/bc7/CMakeLists.txt b/src/bc7/CMakeLists.txt
index 2eb01c06..0c36895b 100644
--- a/src/bc7/CMakeLists.txt
+++ b/src/bc7/CMakeLists.txt
@@ -28,3 +28,8 @@ IF(NOT WIN32)
SET_TARGET_PROPERTIES(bc7 PROPERTIES COMPILE_FLAGS -fPIC)
ENDIF(CMAKE_COMPILER_IS_GNUCXX)
ENDIF(NOT WIN32)
+
+INSTALL(TARGETS bc7
+ RUNTIME DESTINATION bin
+ LIBRARY DESTINATION lib
+ ARCHIVE DESTINATION lib/static)
\ No newline at end of file
6 changes: 5 additions & 1 deletion ports/nvtt/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,18 @@ vcpkg_from_github(
SHA512 6c5c9588af57023fc384de080cbe5c5ccd8707d04a9533384c606efd09730d780cb21bcf2d3576102a3facd2f281cacb2625958d74575e71550fd98da92e38b6
HEAD_REF master
PATCHES
"001-define-value-for-HAVE_UNISTD_H-in-mac-os.patch"
001-define-value-for-HAVE_UNISTD_H-in-mac-os.patch
bc6h.patch
bc7.patch
squish.patch
)

vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
PREFER_NINJA
OPTIONS
-DNVTT_SHARED=0
-DCMAKE_DEBUG_POSTFIX=_d # required by OSG
)

vcpkg_install_cmake()
Expand Down
13 changes: 13 additions & 0 deletions ports/nvtt/squish.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
diff --git a/src/nvtt/squish/CMakeLists.txt b/src/nvtt/squish/CMakeLists.txt
index 832013e1..76824137 100644
--- a/src/nvtt/squish/CMakeLists.txt
+++ b/src/nvtt/squish/CMakeLists.txt
@@ -33,3 +33,7 @@ IF(NOT WIN32)
ENDIF(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_COMPILER_IS_CLANGXX)
ENDIF(NOT WIN32)

+INSTALL(TARGETS squish
+ RUNTIME DESTINATION bin
+ LIBRARY DESTINATION lib
+ ARCHIVE DESTINATION lib/static)
\ No newline at end of file