aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Marshall <xandan@gmail.com>2018-05-22 19:44:33 +0100
committerAlexander Karatarakis <alkarata@microsoft.com>2018-05-29 13:35:09 -0700
commitb82bbc4945a550c070af351fd769885047b54557 (patch)
treefdafa2e8315edaf55f126ac4816bb5ab07fee47f
parent8d97a8ca3e206b5533cd82a3aa4b738ad9da9780 (diff)
downloadvcpkg-b82bbc4945a550c070af351fd769885047b54557.tar.gz
vcpkg-b82bbc4945a550c070af351fd769885047b54557.zip
fixed fmt-targets-debug.cmake and FMT_SHARED
-rw-r--r--ports/fmt/portfile.cmake8
1 files changed, 4 insertions, 4 deletions
diff --git a/ports/fmt/portfile.cmake b/ports/fmt/portfile.cmake
index 40854b7e1..668482aa8 100644
--- a/ports/fmt/portfile.cmake
+++ b/ports/fmt/portfile.cmake
@@ -25,16 +25,16 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/fmtd.dll ${CURRENT_PACKAGES_DIR}/debug/bin/fmtd.dll)
# Force FMT_SHARED to 1
- file(READ ${CURRENT_PACKAGES_DIR}/include/fmt/format.h FMT_FORMAT_H)
- string(REPLACE "defined(FMT_SHARED)" "1" FMT_FORMAT_H "${FMT_FORMAT_H}")
- file(WRITE ${CURRENT_PACKAGES_DIR}/include/fmt/format.h "${FMT_FORMAT_H}")
+ file(READ ${CURRENT_PACKAGES_DIR}/include/fmt/core.h FMT_CORE_H)
+ string(REPLACE "defined(FMT_SHARED)" "1" FMT_CORE_H "${FMT_CORE_H}")
+ file(WRITE ${CURRENT_PACKAGES_DIR}/include/fmt/core.h "${FMT_CORE_H}")
endif()
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
vcpkg_fixup_cmake_targets()
file(READ ${CURRENT_PACKAGES_DIR}/share/fmt/fmt-targets-debug.cmake FMT_DEBUG_MODULE)
-string(REPLACE "lib/fmt.dll" "bin/fmt.dll" FMT_DEBUG_MODULE ${FMT_DEBUG_MODULE})
+string(REPLACE "lib/fmtd.dll" "bin/fmtd.dll" FMT_DEBUG_MODULE ${FMT_DEBUG_MODULE})
file(WRITE ${CURRENT_PACKAGES_DIR}/share/fmt/fmt-targets-debug.cmake "${FMT_DEBUG_MODULE}")
file(READ ${CURRENT_PACKAGES_DIR}/share/fmt/fmt-targets-release.cmake FMT_RELEASE_MODULE)
string(REPLACE "lib/fmt.dll" "bin/fmt.dll" FMT_RELEASE_MODULE ${FMT_RELEASE_MODULE})