diff options
| author | Alexander Karatarakis <alex@karatarakis.com> | 2017-11-13 02:52:14 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-13 02:52:14 -0800 |
| commit | 1ea060d6fa9925dd9146f71b8c73a04bfcc5caf4 (patch) | |
| tree | 5c1e1db0f2d59cb7f5261a02284f3f87a04c2487 | |
| parent | 8bf974b0add21961b85bd2c4c47b01db6655a119 (diff) | |
| parent | a4761aa26b21f3fe621d3fc95d06c0abe478760e (diff) | |
| download | vcpkg-1ea060d6fa9925dd9146f71b8c73a04bfcc5caf4.tar.gz vcpkg-1ea060d6fa9925dd9146f71b8c73a04bfcc5caf4.zip | |
Merge pull request #2182 from seanwarren/libraw-debug-postfix
[libraw] Add 'd' debug postfix
| -rw-r--r-- | ports/libraw/CONTROL | 2 | ||||
| -rw-r--r-- | ports/libraw/portfile.cmake | 7 |
2 files changed, 5 insertions, 4 deletions
diff --git a/ports/libraw/CONTROL b/ports/libraw/CONTROL index 4860b0a6b..e49e79f66 100644 --- a/ports/libraw/CONTROL +++ b/ports/libraw/CONTROL @@ -1,4 +1,4 @@ Source: libraw -Version: 0.18.2-4 +Version: 0.18.2-5 Build-Depends: lcms, jasper Description: raw image decoder library diff --git a/ports/libraw/portfile.cmake b/ports/libraw/portfile.cmake index 797ca5aa0..ee3c1ae26 100644 --- a/ports/libraw/portfile.cmake +++ b/ports/libraw/portfile.cmake @@ -26,6 +26,7 @@ vcpkg_configure_cmake( PREFER_NINJA OPTIONS -DINSTALL_CMAKE_MODULE_PATH=${CURRENT_PACKAGES_DIR}/share/libraw + -DCMAKE_DEBUG_POSTFIX=d ) vcpkg_install_cmake() @@ -40,9 +41,9 @@ file(WRITE ${CURRENT_PACKAGES_DIR}/include/libraw/libraw_types.h "${LIBRAW_H}") # Rename thread-safe version to be "raw.lib". This is unfortunately needed # 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/raw.lib) +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_r.lib ${CURRENT_PACKAGES_DIR}/debug/lib/raw.lib) +file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/raw_rd.lib ${CURRENT_PACKAGES_DIR}/debug/lib/rawd.lib) # Cleanup file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) @@ -53,7 +54,7 @@ file(REMOVE ${DEBUG_EXECUTABLES}) if(VCPKG_LIBRARY_LINKAGE STREQUAL static) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin) else() - file(REMOVE ${CURRENT_PACKAGES_DIR}/bin/raw.dll ${CURRENT_PACKAGES_DIR}/debug/bin/raw.dll) + file(REMOVE ${CURRENT_PACKAGES_DIR}/bin/raw.dll ${CURRENT_PACKAGES_DIR}/debug/bin/rawd.dll) endif() # Rename cmake module into a config in order to allow more flexible lookup rules |