diff options
| author | Robert Schumacher <roschuma@microsoft.com> | 2016-11-29 17:38:54 -0800 |
|---|---|---|
| committer | Robert Schumacher <roschuma@microsoft.com> | 2016-11-29 17:38:54 -0800 |
| commit | 6479147c6e548e0436d4859e177d8dcb10249765 (patch) | |
| tree | a19fbf64302e7d021c92fc317be8b27cdf0dadd7 | |
| parent | a07d94e1f08e65f946520e13beb58ef994bd4a01 (diff) | |
| parent | ab147b838b79692b838e6d3cf794a8caef3e5629 (diff) | |
| download | vcpkg-6479147c6e548e0436d4859e177d8dcb10249765.tar.gz vcpkg-6479147c6e548e0436d4859e177d8dcb10249765.zip | |
Merge branch 'master' into traversaro-add-freeimage
| -rw-r--r-- | ports/libraw/CONTROL | 2 | ||||
| -rw-r--r-- | ports/libraw/portfile.cmake | 10 | ||||
| -rw-r--r-- | toolsrc/src/vcpkg.cpp | 13 |
3 files changed, 9 insertions, 16 deletions
diff --git a/ports/libraw/CONTROL b/ports/libraw/CONTROL index d627cdd16..dd5c7a5c3 100644 --- a/ports/libraw/CONTROL +++ b/ports/libraw/CONTROL @@ -1,4 +1,4 @@ Source: libraw -Version: 0.17.2 +Version: 0.17.2-1 Build-Depends: libjpeg-turbo Description: raw image decoder library diff --git a/ports/libraw/portfile.cmake b/ports/libraw/portfile.cmake index 69c168a07..3ff69a6e0 100644 --- a/ports/libraw/portfile.cmake +++ b/ports/libraw/portfile.cmake @@ -23,12 +23,16 @@ file(COPY ${LIBRAW_CMAKE_SOURCE_PATH}/cmake DESTINATION ${SOURCE_PATH}) vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} OPTIONS - -DINSTALL_CMAKE_MODULE_PATH=${SOURCE_PATH} + -DINSTALL_CMAKE_MODULE_PATH=${CURRENT_PACKAGES_DIR}/share/libraw ) vcpkg_install_cmake() -file(COPY ${SOURCE_PATH}/FindLibRaw.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/libraw/cmake/FindLibRaw.cmake) +# 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(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) # Cleanup file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) @@ -38,6 +42,8 @@ file(GLOB DEBUG_EXECUTABLES ${CURRENT_PACKAGES_DIR}/debug/bin/*.exe) 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) endif() # Handle copyright diff --git a/toolsrc/src/vcpkg.cpp b/toolsrc/src/vcpkg.cpp index acebd57b9..b1fe76982 100644 --- a/toolsrc/src/vcpkg.cpp +++ b/toolsrc/src/vcpkg.cpp @@ -20,19 +20,6 @@ bool vcpkg::g_do_dry_run = false; namespace { - template <class M, class K, class V> - auto find_or_default(const M& map, const K& key, const V& val) - { - auto it = map.find(key); - if (it == map.end()) - return decltype(it->second)(val); - else - return it->second; - } -} - -namespace -{ std::fstream open_status_file(const vcpkg_paths& paths, std::ios_base::openmode mode = std::ios_base::app | std::ios_base::in | std::ios_base::out | std::ios_base::binary) { return std::fstream(paths.vcpkg_dir_status_file, mode); |