3party/vcpkg
0
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2025-01-14 13:28:01 +08:00
Code Issues Projects Releases Wiki Activity

[libsigcpp]fix libsigcpp include path (#29507)

Browse Source 
* fix libsigcpp include path

* update version files

* fix indent

* change version number back

* fix pc

* rerun x-add-version

* Update license and upstream version

* revert and re-generate version files

* Update ports/libsigcpp/portfile.cmake

Co-authored-by: jim wang <122244446+jimwang118@users.noreply.github.com>

* Update version again....

---------

Co-authored-by: jim wang <122244446+jimwang118@users.noreply.github.com>
This commit is contained in:
6ziv 2023-02-10 06:25:22 +08:00 committed by GitHub
parent 6f18cff584
commit 4bf41e29cf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 58 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
ports/libsigcpp/fix_include_path.patch Normal file
View File

@ -0,0 +1,45 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 73990c4..38424a2 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -84,7 +84,7 @@ add_custom_target(uninstall
install (FILES
"${CMAKE_CURRENT_BINARY_DIR}/sigc++config.h"
DESTINATION
- "${CMAKE_INSTALL_PREFIX}/lib/${PROJECT_NAME}-${SIGCXX_API_VERSION}/include")
+ "${CMAKE_INSTALL_PREFIX}/include")
install (FILES
"${CMAKE_CURRENT_BINARY_DIR}/sigc++-${SIGCXX_API_VERSION}.pc"
@@ -102,7 +102,7 @@ add_subdirectory (sigc++)
set (PROJECT_CMAKE_NAME "${PROJECT_NAME}-3")
set (VERSION_CONFIG "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_CMAKE_NAME}ConfigVersion.cmake")
-set (LIBSIGCXX_INCLUDE_DIR "${CMAKE_INSTALL_PREFIX}/lib/${PROJECT_NAME}-${SIGCXX_API_VERSION}/include")
+set (LIBSIGCXX_INCLUDE_DIR "${CMAKE_INSTALL_PREFIX}/include")
set (PROJECT_CONFIG "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_CMAKE_NAME}Config.cmake")
set (CONFIG_INSTALL_DIR "lib/cmake/${PROJECT_CMAKE_NAME}")
set (TARGETS_EXPORT_NAME "${PROJECT_CMAKE_NAME}Targets")
diff --git a/sigc++.pc.in b/sigc++.pc.in
index 05de315..171b38d 100644
--- a/sigc++.pc.in
+++ b/sigc++.pc.in
@@ -15,4 +15,4 @@ Description: Typesafe signal and callback system for C++
Version: @PACKAGE_VERSION@
URL: https://libsigcplusplus.github.io/libsigcplusplus/
Libs: -L${libdir} -lsigc-@SIGCXX_API_VERSION@
-Cflags: -I${includedir}/sigc++-@SIGCXX_API_VERSION@ -I${libdir}/sigc++-@SIGCXX_API_VERSION@/include
+Cflags: -I${includedir}
diff --git a/sigc++/CMakeLists.txt b/sigc++/CMakeLists.txt
index 86f1be7..076959b 100644
--- a/sigc++/CMakeLists.txt
+++ b/sigc++/CMakeLists.txt
@@ -29,7 +29,7 @@ set_property (TARGET ${SIGCPP_LIB_NAME} PROPERTY VERSION ${PACKAGE_VERSION})
set_property(TARGET ${SIGCPP_LIB_NAME} PROPERTY SOVERSION ${LIBSIGCPP_SOVERSION})
target_compile_definitions( ${SIGCPP_LIB_NAME} PRIVATE -DSIGC_BUILD )
-set (INCLUDE_INSTALL_DIR "include/${PROJECT_NAME}-${SIGCXX_API_VERSION}")
+set (INCLUDE_INSTALL_DIR "include/")
install (
DIRECTORY "${PROJECT_SOURCE_DIR}"

9
ports/libsigcpp/portfile.cmake
View File

@ -1,12 +1,13 @@
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO libsigcplusplus/libsigcplusplus
REF 3.2.0
SHA512 95ab0acfc2c5a151335e73bdc9b0e058af67d9706d0697bfd938e38c51e853fdb29d7a26484f192abe150640c60d5e30075a23deaa043a8deed70616bc9f508a
REF "${VERSION}"
SHA512 8b80f0988daea4eb2c827be57de21167f54a9bf3e9704d64d17d12aef064d8ad87d00f95ce4b5add7666452561c5ca42aa45cf677e54068974a4ea813af3b235
HEAD_REF master
PATCHES
PATCHES
disable_tests_enable_static_build.patch
fix-shared-windows-build.patch
fix_include_path.patch
)
vcpkg_cmake_configure(
@ -18,7 +19,7 @@ vcpkg_fixup_pkgconfig()
vcpkg_cmake_config_fixup(PACKAGE_NAME sigc++-3 CONFIG_PATH lib/cmake/sigc++-3)
if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/lib/sigc++-3.0/include/sigc++config.h" "ifdef BUILD_SHARED" "if 1")
vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/sigc++config.h" "ifdef BUILD_SHARED" "if 1")
endif()
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")

4
ports/libsigcpp/vcpkg.json
View File

@ -1,9 +1,9 @@
{
"name": "libsigcpp",
"version": "3.2.0",
"version": "3.4.0",
"description": "Typesafe callback framework for C++",
"homepage": "https://libsigcplusplus.github.io/libsigcplusplus/",
"license": "LGPL-3.0",
"license": "LGPL-3.0-or-later",
"dependencies": [
{
"name": "vcpkg-cmake",

2
versions/baseline.json
View File

@ -4325,7 +4325,7 @@
"port-version": 0
},
"libsigcpp": {
"baseline": "3.2.0",
"baseline": "3.4.0",
"port-version": 0
},
"libsigcpp-3": {

5
versions/l-/libsigcpp.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "4aba60e7d2936fd4a786b50f14cbdd99dbf21805",
"version": "3.4.0",
"port-version": 0
},
{
"git-tree": "7631555eb4ab142a7f643a266f79a87bc8aeca12",
"version": "3.2.0",