aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLarryIII <33021067+LarryIII@users.noreply.github.com>2019-02-27 23:44:03 -0800
committerPhil Christensen <philc@microsoft.com>2019-02-27 23:44:03 -0800
commit1d442a0b5aae9a6ad644156247346abae72509df (patch)
tree9712029a38414363f19d2cc265ce958b4717c8f6
parent8564602d06d7c4ce236f96a4f0f3ba7c2d769cb0 (diff)
downloadvcpkg-1d442a0b5aae9a6ad644156247346abae72509df.tar.gz
vcpkg-1d442a0b5aae9a6ad644156247346abae72509df.zip
[libraw] Fix build release only issue (#5484)
-rw-r--r--ports/libraw/CONTROL2
-rw-r--r--ports/libraw/portfile.cmake10
2 files changed, 8 insertions, 4 deletions
diff --git a/ports/libraw/CONTROL b/ports/libraw/CONTROL
index 431ba1dc7..ba378b8ff 100644
--- a/ports/libraw/CONTROL
+++ b/ports/libraw/CONTROL
@@ -1,4 +1,4 @@
Source: libraw
-Version: 0.19.0-1
+Version: 0.19.0-2
Build-Depends: lcms, jasper
Description: raw image decoder library
diff --git a/ports/libraw/portfile.cmake b/ports/libraw/portfile.cmake
index 7badade25..1ed02eab4 100644
--- a/ports/libraw/portfile.cmake
+++ b/ports/libraw/portfile.cmake
@@ -52,13 +52,17 @@ if(NOT VCPKG_CMAKE_SYSTEM_NAME OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore
# because otherwise libraries that build on top of libraw have to choose.
file(REMOVE ${CURRENT_PACKAGES_DIR}/lib/raw.lib ${CURRENT_PACKAGES_DIR}/debug/lib/rawd.lib)
file(RENAME ${CURRENT_PACKAGES_DIR}/lib/raw_r.lib ${CURRENT_PACKAGES_DIR}/lib/raw.lib)
- file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/raw_rd.lib ${CURRENT_PACKAGES_DIR}/debug/lib/rawd.lib)
+ if(NOT VCPKG_BUILD_TYPE STREQUAL "release")
+ file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/raw_rd.lib ${CURRENT_PACKAGES_DIR}/debug/lib/rawd.lib)
+ endif()
# Cleanup
file(GLOB RELEASE_EXECUTABLES ${CURRENT_PACKAGES_DIR}/bin/*.exe)
file(REMOVE ${RELEASE_EXECUTABLES})
- file(GLOB DEBUG_EXECUTABLES ${CURRENT_PACKAGES_DIR}/debug/bin/*.exe)
- file(REMOVE ${DEBUG_EXECUTABLES})
+ if(NOT VCPKG_BUILD_TYPE STREQUAL "release")
+ file(GLOB DEBUG_EXECUTABLES ${CURRENT_PACKAGES_DIR}/debug/bin/*.exe)
+ file(REMOVE ${DEBUG_EXECUTABLES})
+ endif()
endif()
if(VCPKG_LIBRARY_LINKAGE STREQUAL static)