aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNancyLi1013 <46708020+NancyLi1013@users.noreply.github.com>2021-09-10 11:41:22 +0800
committerGitHub <noreply@github.com>2021-09-09 20:41:22 -0700
commitd251db7f968b8c53823e07c980dbc99649aaf345 (patch)
tree4bcaaff0688d16fb4c850e475d9e9279487ba912
parentc24f57e9fc85dd4ecfd1b3ab34b72dbf3eb46306 (diff)
downloadvcpkg-d251db7f968b8c53823e07c980dbc99649aaf345.tar.gz
vcpkg-d251db7f968b8c53823e07c980dbc99649aaf345.zip
[freeimage] Enable version information in FreeImage.dll (#19610)
* [freeimage] Add version in FreeImage.dll * Add version files Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
-rw-r--r--ports/freeimage/CMakeLists.txt2
-rw-r--r--ports/freeimage/vcpkg.json4
-rw-r--r--versions/baseline.json2
-rw-r--r--versions/f-/freeimage.json5
4 files changed, 9 insertions, 4 deletions
diff --git a/ports/freeimage/CMakeLists.txt b/ports/freeimage/CMakeLists.txt
index 345c5d4d9..2c2fb129e 100644
--- a/ports/freeimage/CMakeLists.txt
+++ b/ports/freeimage/CMakeLists.txt
@@ -79,7 +79,7 @@ else()
endif()
list(APPEND PUBLIC_HEADERS ${CMAKE_CURRENT_BINARY_DIR}/FreeImageConfig.h)
-add_library(FreeImage ${SRCS} ${PRIVATE_HEADERS} ${PUBLIC_HEADERS})
+add_library(FreeImage ${SRCS} ${PRIVATE_HEADERS} ${PUBLIC_HEADERS} ${CMAKE_CURRENT_SOURCE_DIR}/FreeImage.rc)
if(BUILD_SHARED_LIBS)
target_compile_definitions(FreeImage PRIVATE -DFREEIMAGE_EXPORTS)
diff --git a/ports/freeimage/vcpkg.json b/ports/freeimage/vcpkg.json
index 4f78fd876..3d68598ad 100644
--- a/ports/freeimage/vcpkg.json
+++ b/ports/freeimage/vcpkg.json
@@ -1,7 +1,7 @@
{
"name": "freeimage",
- "version-string": "3.18.0",
- "port-version": 20,
+ "version": "3.18.0",
+ "port-version": 21,
"description": "Support library for graphics image formats",
"homepage": "https://sourceforge.net/projects/freeimage/",
"dependencies": [
diff --git a/versions/baseline.json b/versions/baseline.json
index 66afb5eed..598acc447 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -2150,7 +2150,7 @@
},
"freeimage": {
"baseline": "3.18.0",
- "port-version": 20
+ "port-version": 21
},
"freeopcua": {
"baseline": "20190125",
diff --git a/versions/f-/freeimage.json b/versions/f-/freeimage.json
index ba162ca75..bc867ec11 100644
--- a/versions/f-/freeimage.json
+++ b/versions/f-/freeimage.json
@@ -1,6 +1,11 @@
{
"versions": [
{
+ "git-tree": "7d0f28dd10d54f1f11d09875fbfafd1579e948c4",
+ "version": "3.18.0",
+ "port-version": 21
+ },
+ {
"git-tree": "d223c6f4524784f9d87c7aa0815e5b99d2f66116",
"version-string": "3.18.0",
"port-version": 20