diff options
| author | miheer vaidya <v.miheer@gmail.com> | 2021-01-19 16:29:30 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-19 15:29:30 -0800 |
| commit | 852d471ff34bec009b2826b4263d2ef4b91b57e8 (patch) | |
| tree | 2b7a9deee14ca2563c73ba2415d10fbf895d0559 | |
| parent | 2f542209ce25b9621279f149ebac5402cfaccbe5 (diff) | |
| download | vcpkg-852d471ff34bec009b2826b4263d2ef4b91b57e8.tar.gz vcpkg-852d471ff34bec009b2826b4263d2ef4b91b57e8.zip | |
[libconfig] shlwapi is not available on linux (#15613)
* shlwapi is not available on linux
This fixes error while building for `x64-linux-dynamic`.
* Update control version
* Update port_versions
Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
Co-authored-by: NancyLi1013 <lirui09@beyondsoft.com>
| -rw-r--r-- | port_versions/baseline.json | 4 | ||||
| -rw-r--r-- | port_versions/l-/libconfig.json | 5 | ||||
| -rw-r--r-- | ports/libconfig/CMakeLists.txt | 5 | ||||
| -rw-r--r-- | ports/libconfig/CONTROL | 3 |
4 files changed, 13 insertions, 4 deletions
diff --git a/port_versions/baseline.json b/port_versions/baseline.json index 974688fc4..9858b5049 100644 --- a/port_versions/baseline.json +++ b/port_versions/baseline.json @@ -2853,8 +2853,8 @@ "port-version": 0 }, "libconfig": { - "baseline": "1.7.2-2", - "port-version": 0 + "baseline": "1.7.2", + "port-version": 3 }, "libconfuse": { "baseline": "2019-07-14", diff --git a/port_versions/l-/libconfig.json b/port_versions/l-/libconfig.json index cfbe45348..45a6c7df8 100644 --- a/port_versions/l-/libconfig.json +++ b/port_versions/l-/libconfig.json @@ -1,6 +1,11 @@ { "versions": [ { + "git-tree": "c82b5fbc0a37ebd11ecb4f87b9d63df2552805e7", + "version-string": "1.7.2", + "port-version": 3 + }, + { "git-tree": "02e991af7253bd4ef78d90fc43680c98be8bc817", "version-string": "1.7.2-2", "port-version": 0 diff --git a/ports/libconfig/CMakeLists.txt b/ports/libconfig/CMakeLists.txt index fe70cb9dd..53ca6f4e0 100644 --- a/ports/libconfig/CMakeLists.txt +++ b/ports/libconfig/CMakeLists.txt @@ -37,7 +37,10 @@ else() target_compile_definitions(libconfig++ PUBLIC -DLIBCONFIGXX_STATIC) endif() -target_link_libraries(libconfig shlwapi) +if (WIN32) + # Linux doesn't have shlwapi + target_link_libraries(libconfig shlwapi) +endif() target_link_libraries(libconfig++ PRIVATE libconfig) install( diff --git a/ports/libconfig/CONTROL b/ports/libconfig/CONTROL index b6b5eb74b..f3a634240 100644 --- a/ports/libconfig/CONTROL +++ b/ports/libconfig/CONTROL @@ -1,4 +1,5 @@ Source: libconfig -Version: 1.7.2-2 +Version: 1.7.2 +Port-Version: 3 Homepage: https://github.com/hyperrealm/libconfig Description: C/C++ library for processing configuration files |